Merge with git://repo.or.cz/git.git#master
commitd5f1c1bbc07f993e8faca3f45ca386fd8bb14c5d
authorJohannes Sixt <johannes.sixt@telecom.at>
Tue, 27 Feb 2007 15:15:36 +0000 (27 16:15 +0100)
committerJohannes Sixt <johannes.sixt@telecom.at>
Tue, 27 Feb 2007 15:15:36 +0000 (27 16:15 +0100)
treed1e123ce71d956a389edcb14ef68d7414c0f6da7
parente62f9693f184d53b27820139ab4f811f41b2ced3
parentc260d790c85c07a5f50235f664c36725deedfb10
Merge with git://repo.or.cz/git.git#master
23 files changed:
.gitignore
Makefile
builtin-fmt-merge-msg.c
builtin-reflog.c
cache.h
config.c
connect.c
diff.c
exec_cmd.c
fetch-pack.c
git-compat-util.h
git-merge.sh
git.c
help.c
merge-index.c
receive-pack.c
refs.c
send-pack.c
setup.c
sha1_file.c
t/t4016-diff-quote.sh
t/test-lib.sh
upload-pack.c