git, branch v1.6.4

GIT 1.6.4

2009-07-29T07:32:42Z

Signed-off-by: Junio C Hamano

Sync with 1.6.3.4

2009-07-29T07:00:56Z

Signed-off-by: Junio C Hamano

GIT 1.6.3.4

2009-07-29T06:59:30Z

Signed-off-by: Junio C Hamano

config.txt: document add.ignore-errors

2009-07-29T06:56:01Z

Use the description of "--ignore-errors" from git-add.txt as inspiration. Signed-off-by: Stephen Boyd Signed-off-by: Junio C Hamano

request-pull: allow ls-remote to notice remote.$nickname.uploadpack

2009-07-29T06:31:38Z

The location to pull from should be converted from the configured nickname to URL in the message, but ls-remote should be fed the nickname so that the command uses remote.$nickname.* variables, most notably "uploadpack". Signed-off-by: Tom Grennan Signed-off-by: Junio C Hamano

Update the documentation of the raw diff output format

2009-07-28T20:32:59Z

This includes mentioning the initial hash output of diff-tree, and changes the header to "raw output format" which is more descriptive. Signed-off-by: David Kågedal Signed-off-by: Junio C Hamano

git-rerere.txt: Clarify ambiguity of the config variable

2009-07-28T20:30:42Z

Use the less ambiguous "set variable foo in order to enable bar" rather than "set variable foo to enable bar" which may trick users into assuming that "enable" is a good value for "foo". Signed-off-by: Michael J Gruber Signed-off-by: Junio C Hamano

t9143: do not fail if Compress::Zlib is missing

2009-07-26T18:51:45Z

"git svn gc" will not compress unhandled.log files if Compress::Zlib is missing. However, leftover index files should always be removed, so add a test for this behavior as well. Signed-off-by: Eric Wong Signed-off-by: Junio C Hamano

Trivial path quoting fixes in git-instaweb

2009-07-26T18:27:27Z

Bodo Schlecht noticed that Instaweb didn't propely quote all path instances in the Apache config file it generated. Acked-by: Eric Wong Signed-off-by: Junio C Hamano

Merge branch 'gp/maint-rebase-p-onto'

2009-07-26T18:24:13Z

* gp/maint-rebase-p-onto: Fix rebase -p --onto