fast forward
    pickaxe
    refspec
    tracking branch

Wild hack allows "link:git-" prefix to reference commands too.
Signed-off-by: NJon Loeliger <jdl@jdl.com>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Signed-off-by: NJon Loeliger <jdl@jdl.com>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Signed-off-by: NMatthias Kestenholz <matthias@spinlock.ch>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

This makes git-send-email easier to develop and debug, skipping the need
to `make git-send-email` every time.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Give the user a hint for how to continue in the case that git-am fails because it requires user intervention

Give the user a hint for how to continue in the case that git-am fails
because it requires user intervention.
Signed-off-by: NRobert Shearman <rob@codeweaves.com>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Signed-off-by: NHuw Davies <huw@codeweavers.com>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Signed-off-by: NSean Estabrooks <seanlkml@sympatico.ca>

Adds an xsl fragment to render docbook callouts when
converting to man page format.  Update the Makefile
to have "xmlto" use it when generating man pages.
Signed-off-by: NSean Estabrooks <seanlkml@sympatico.ca>

Unfortunately docbook does not allow a callout to be
referenced from inside a callout list description.
Rewrite one paragraph in git-reset man page to work
around this limitation.
Signed-off-by: NSean Estabrooks <seanlkml@sympatico.ca>

and fix up asciidoc "callouts"
Signed-off-by: NSean Estabrooks <seanlkml@sympatico.ca>

Signed-off-by: NMatthias Kestenholz <matthias@spinlock.ch>

Use of uninitialized value in scalar chomp at
./git-annotate.perl line 212, <$kid> chunk 4.
Signed-off-by: NMatthias Kestenholz <matthias@spinlock.ch>

After doing the hard work of hand resolving the conflicts in the
working tree, if the user forgets to run update-index to mark
the paths that have been resolved, the command gave an
unfriendly "fatal: git-write-tree: not able to write tree" error
message.  Catch the situation early and give more meaningful
message and suggestion.

Noticed and suggested by Len Brown.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Check internal integrity to report corrupt pack or idx, and
then check cross-integrity between idx and pack.
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

There is no point reading the whole object just to make sure it exists and
it is of the expected type.  We added sha1_object_info() for such need
after this code was written, so use it.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

When we are in a subdirectory of a git archive, we need to take the prefix
of that subdirectory into accoung when we verify filename arguments.

Noted by Matthias Lederhofer

This also uses the improved error reporting for all the other git commands
that use the revision parsing interfaces, not just git-rev-parse. Also, it
makes the error reporting for mixed filenames and argument flags clearer
(you cannot put flags after the start of the pathname list).

[jc: with fix to a trivial typo noticed by Timo Hirvonen]
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Noticed by Sean.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

The set_reuse_addr() error case was the only error case in
socklist() where we returned rather than continued.  Not sure
why.  Either we must free the socklist, or continue.  This patch
continues on error.
Signed-off-by: NSerge E. Hallyn <serue@us.ibm.com>
Signed-off-by: NJunio C Hamano <junkio@cox.net>
(cherry picked from 0032d548 commit)

This patch adds a Documentation/config.txt file included by git-repo-config
and currently aggregating hopefully all the available git plumbing / core
porcelain configuration variables, as well as briefly describing the format.

It also updates an outdated bit of the example in git-repo-config(1).
Signed-off-by: NPetr Baudis <pasky@suse.cz>

Signed-off-by: NPetr Baudis <pasky@suse.cz>

Currently, if git-rev-parse encounters an argument that is neither a
recognizable revision name nor the name of an existing file or
directory, and it hasn't encountered a "--" argument, it prints an
error message saying "No such file or directory".  This can be
confusing for users, including users of programs such as gitk that
use git-rev-parse, who may then think that they can't ask about the
history of files that no longer exist.

This makes it print a better error message, one that points out the
ambiguity and tells the user what to do to fix it.
Signed-off-by: NPaul Mackerras <paulus@samba.org>

When $PAGER is set to 'less -i', we used to fail because we
assumed the $PAGER is a command and simply exec'ed it.

Try exec first, and then run it through shell if it fails.  This
allows even funkier PAGERs like these ;-):

	PAGER='sed -e "s/^/`date`: /" | more'
	PAGER='contrib/colordiff.perl | less -RS'
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

The input line has 40 _chars_ of sha1 and no 20 _bytes_. It should also
account for the space before the pathname, and the terminating \n and \0.
Signed-off-by: NNicolas Pitre <nico@cam.org>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Quoted-Printable (RFC 2045) and the "Q" encoding (RFC 2047) are
subtly different; the latter is used on the mail header and an
underscore needs to be decoded to 0x20.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Introduced in 4802426d.
Signed-off-by: NSanti Béjar <sbejar@gmail.com>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Because we sort the delta window by name-hash and then size,
hitting an object that is too small to consider as a delta base
for the current object does not mean we do not have better
candidate in the window beyond it.

Noticed by Shawn Pearce, analyzed by Nico, Linus and me.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

When running "git commit --amend" only to fix the commit log
message without any content change, we mistakenly showed the
git-status output that says "nothing to commit" without
commenting it out.

If you have already run update-index but you want to amend the
top commit, "git commit --amend --only" without any paths should
have worked, because --only means "starting from the base
commit, update-index these paths only to prepare the index to
commit, and perform the commit".  However, we refused -o without
paths.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Several <<< or === or >>> characters at the beginning of a line
is very likely to be leftover conflict markers from a failed
automerge the user resolved incorrectly, so detect them.

As usual, this can be defeated with "git commit --no-verify" if
you really do want to have those files, just like changes that
introduce trailing whitespaces.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

We said "fix up by hand" after failed automerge, which was a big
"Huh?  Now what?".  Be a bit more explicit without being too
verbose. Suggested by Carl Worth.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

The new --reference flag introduced to git-clone in
GIT 1.3.0 was not documented but is rather handy.
So document it.

Also corrected a minor issue with the documentation for the
-s flag; the info/alternates file name was spelled wrong.
Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Set maximum filename length for binary files so that scaling won't be
triggered and result in invalid string access.
Signed-off-by: NJonas Fonseca <fonseca@diku.dk>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Signed-off-by: NJunio C Hamano <junkio@cox.net>

[jc: with entries in git.txt]
Signed-off-by: NJonas Fonseca <fonseca@diku.dk>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Just like "patch" format always needs recursive, "diffstat"
format does not make sense without setting recursive.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

added svn:special symlink support for access methods other than
direct-http
Signed-off-by: NHerbert Valerio Riedel <hvr@gnu.org>
Acked-by: NMatthias Urlichs <smurf@smurf.noris.de>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Serge E. Hallyn noticed that we compute how many input bytes are
still left, but did not use it for sanity checking.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Not sure whether it should be removed, or whether
execv_git_cmd() should return it rather than -1 at bottom.
Signed-off-by: NSerge E. Hallyn <serue@us.ibm.com>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Config_filename and lockfile are strduped and then leaked in
git_config_set_multivar.
Signed-off-by: NSerge E. Hallyn <serue@us.ibm.com>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

The switch is inside an if statement which is false if
the character is ' '.  Either the if should be <=' '
instead of <' ', or the case should be removed as it could
be misleading.
Signed-off-by: NSerge E. Hallyn <serue@us.ibm.com>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Mod_type in particular sure looks like it wants to be used, but isn't.
Signed-off-by: NSerge E. Hallyn <serue@us.ibm.com>
Signed-off-by: NJunio C Hamano <junkio@cox.net>