Merge commit 'v1.5.3' into devel
commit53009e47c2b55d6c23925bb77116545f2308cef9
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Mon, 3 Sep 2007 23:44:39 +0000 (4 00:44 +0100)
committerJohannes Schindelin <johannes.schindelin@gmx.de>
Mon, 3 Sep 2007 23:44:39 +0000 (4 00:44 +0100)
treee92beb41bc49b1b9e70dc7c22ebd598f7b767fde
parent59f8c189a5d582d5eef28ca4021d04087dff2eff
parent86bab9615c3516d4ac7756ae3c1285d331b78f04
Merge commit 'v1.5.3' into devel

Conflicts:

connect.c
git-clone.sh
git.c
t/t5701-clone-local.sh
26 files changed:
Makefile
builtin-apply.c
builtin-init-db.c
builtin-ls-files.c
builtin-tag.c
cache.h
connect.c
diff-lib.c
diff.c
git-clone.sh
git-compat-util.h
git-rebase.sh
git.c
gitk
ident.c
index-pack.c
read-cache.c
sha1_file.c
t/t1301-shared-repo.sh
t/t3404-rebase-interactive.sh
t/t3700-add.sh
t/t3902-quoted.sh
t/t5701-clone-local.sh
t/t7003-filter-branch.sh
t/t7004-tag.sh
t/t9300-fast-import.sh