git log without --pretty showed author and author-date, while
with --pretty=full showed author and committer but no dates.
The new formatting option, --pretty=fuller, shows both name and
timestamp for author and committer.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

I noticed format-patch loses authorship information of Lukas' patch
when I run git tools with LC_LANG set to ja_JP.  It turns out that
the sed script to set environment variables were not working on his
name (encoded in UTF-8), which is unfortunate but technically correct.

Force sed invocation under C locale because we always want literal byte
semantics.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

You could also spell it ssh://host:/path/to/repo (or git+ssh,
ssh+git), but without method:// is shorter to type, so mention
only that one in the short and sweet list.

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

Otherwise, git-clone silently failed to clone a remote
repository where redirections (ie. a response with a
"Location" header line) are used.

This includes the fixes from Nick Hengeveld.
Signed-off-by: NJosef Weidendorfer <Josef.Weidendorfer@gmx.de>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

When git-update-ref has hit the "Ref %s changed to %s" error, I just stare
at it, left puzzled. This patch attempts to reword that to a more useful
and less confusing error message.
Signed-off-by: NPetr Baudis <pasky@suse.cz>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Signed-off-by: NJim Radford <radford@blackbean.org>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

This does two things:

 - It changes the hardcoded default merge strategy for two-head
   git-pull from resolve to recursive.

 - .git/config file acquires two configuration items.
   pull.twohead names the strategy for two-head case, and
   pull.octopus names the strategy for octopus merge.

IOW you are paranoid, you can have the following lines in your
.git/config file and keep using git-merge-resolve when pulling
one remote:

	[pull]
		twohead = resolve

OTOH, you can say this:

	[pull]
		twohead = resolve
		twohead = recursive

to try quicker resolve first, and when it fails, fall back to
recursive.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

It may get extra merge base on truly pathological commit histories,
but is a lot easier to understand, explain, and prove correctness.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

We run git-apply with --stat and --summary at the end of the pull
by default, which causes it to barf when the pull brought in changes
to binary files.  Just mark them as binary patch and proceed when
not applying nor checking.

[jc: I almost missed --check until I saw Linus did something similar.]
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Explicitly mention how to install by hand in build-as-user and
install-as-root steps.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

A branch name could have a slash in it.
Signed-off-by: NFredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

The previous code did the right thing, but it did it by accident.
Signed-off-by: NFredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

There is a syntax error in cvsexport script:
Signed-off-by: NJunio C Hamano <junkio@cox.net>

"git resolve" is being deprecated in favour of "git merge".
Update the documentation to reflect this.
Signed-off-by: NTony Luck <tony.luck@intel.com>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Make a bunch of needlessly global functions static, and replace two
K&R-style declarations.
Signed-off-by: NPeter Hagervall <hager@cs.umu.se>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

This adds option '-d' to git-tag.sh and documents it.
Signed-off-by: NKai Ruemmler <kai.ruemmler@gmx.net>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Allow failed tests to be ignored using make's "-i". The patch also
disables parallel make in t/. This doesn't make the testing any
different as before: the tests were run sequentially before.

It also allows to run more tests, ignoring the ones usually failing
just to figure out if something else broke.  (Or to ignore plainly
uninteresting situations because of the testing being done on say...
cygwin ;)
Signed-off-by: NJunio C Hamano <junkio@cox.net>

$TAR isn't set everywhere. Provide a default (tar)
Signed-off-by: NAlex Riesen <raa.lkml@gmail.com>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

As Pasky pointed out, building in templates directory showed
list of built template files which was unneeded.  This commit
also fixes another build annoyance I recently left in by
accident.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Signed-off-by: NJim Radford <radford@blackbean.org>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

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

Now that the leak is gone, there is by default no limit of revisions to
import.  No more message about leak when the limit (given by the -l
parameter) is reached.
Signed-off-by: NYaacov Akiba Slama <ya@slamail.org>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Fix an error when a svn revision consists only of the creation of a new tag
directory (/tags/this_is_a_tag).
Signed-off-by: NYaacov Akiba Slama <ya@slamail.org>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

When copying files and/or directories from several branches in one single
revision, all these branches are used as parents of the commit.
Signed-off-by: NYaacov Akiba Slama <ya@slamail.org>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

The A (Add) and R (Replace) actions handling are unified.
Signed-off-by: NYaacov Akiba Slama <ya@slamail.org>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

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

Signed-off-by: NYaacov Akiba Slama <ya@slamail.org>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Signed-off-by: NYaacov Akiba Slama <ya@slamail.org>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

The last round stopped munging the patch when resuming, but
failed to preserve final-commit.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

ls-files.c and read-tree.c miss the default configuration, in
particular the filemode=false part.  The recent +x bit flip made me
notice that, because git-merge refused to merge anything saying that
git-pull.sh is not up to date.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Do not scatter txt and html documentation into feature subpackages.
Do place man pages into them.

Capture more cvs stuff into git-cvs package.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

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

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

Signed-off-by: NNick Hengeveld <nickh@reactrix.com>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Use 'git merge' instead.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

The previous rule misses the case where git.txt or tutorial.txt
includes new files.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

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

List new commands cvsexportcommit and http-push to .gitignore list.
Also cover the test programs (test-date and test-delta).
Signed-off-by: NJunio C Hamano <junkio@cox.net>