Merge commit 'spearce/master'
commit89afdd6d622200b703e570c0edef3b78d469573c
authorJohannes Sixt <johannes.sixt@telecom.at>
Fri, 19 Oct 2007 20:50:43 +0000 (19 22:50 +0200)
committerJohannes Sixt <johannes.sixt@telecom.at>
Fri, 19 Oct 2007 20:50:43 +0000 (19 22:50 +0200)
tree9cf811fc77bfb3cd9e72473e7859599df080dc83
parent4a7c98dbaf129f2546f8b8780650b4041c336228
parent7840ce6cb24a9d65152d45e08f5d7cf7dc97a2e3
Merge commit 'spearce/master'
15 files changed:
Makefile
builtin-config.c
builtin-fmt-merge-msg.c
cache.h
connect.c
date.c
diff.c
git-commit.sh
git-compat-util.h
git-merge.sh
git.c
refs.c
setup.c
sha1_file.c
t/t5000-tar-tree.sh