Public Git Hosting - git/dscho.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 59f8c18 86bab96)

commit	53009e47c2b55d6c23925bb77116545f2308cef9
author	Johannes Schindelin <johannes.schindelin@gmx.de>
	Mon, 3 Sep 2007 23:44:39 +0000 (4 00:44 +0100)
committer	Johannes Schindelin <johannes.schindelin@gmx.de>
	Mon, 3 Sep 2007 23:44:39 +0000 (4 00:44 +0100)
tree	e92beb41bc49b1b9e70dc7c22ebd598f7b767fde	tree \| snapshot (tar.gz zip)
parent	59f8c189a5d582d5eef28ca4021d04087dff2eff	commit \| diff
parent	86bab9615c3516d4ac7756ae3c1285d331b78f04	commit \| diff

Merge commit 'v1.5.3' into devel

Conflicts:

connect.c
git-clone.sh
git.c
t/t5701-clone-local.sh

26 files changed:

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

Dscho's miscellaneous git branches