Merge with git://repo.or.cz/git.git#next
commit97b0db330becf58fedcbdbc8e1c6db1db1654699
authorJohannes Sixt <johannes.sixt@telecom.at>
Mon, 29 Jan 2007 13:46:37 +0000 (29 14:46 +0100)
committerJohannes Sixt <johannes.sixt@telecom.at>
Mon, 29 Jan 2007 14:07:37 +0000 (29 15:07 +0100)
tree207a9232b34a9be1246655ab42b4da0d8dc29895
parent5c098f977167ae604483848323c123c2ae620e6b
parentf8de91f96289d4142683f8c836280680f1edd6cd
Merge with git://repo.or.cz/git.git#next
13 files changed:
.gitignore
Makefile
builtin-reflog.c
cache.h
fetch-pack.c
git-compat-util.h
git.c
gitk
ident.c
receive-pack.c
refs.c
t/t3200-branch.sh
t/t5301-sliding-window.sh