git.99rst.org Git - git.git/commit

git.99rst.org / git.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3f83594 2845265)

author	Junio C Hamano <redacted>
	Tue, 11 Sep 2012 17:53:40 +0000 (10:53 -0700)
committer	Junio C Hamano <redacted>
	Tue, 11 Sep 2012 17:53:40 +0000 (10:53 -0700)
commit	738c2187604756fea3901554a49f9137e02ed0ef
tree	ac786621832f1ac568761e96989ca984a836530e	tree \| snapshot
parent	3f835949e9b800619136f2511e84000c95916d6e	commit \| diff
parent	28452655af988094792483a51d188c58137760cd	commit \| diff

Merge branch 'tr/void-diff-setup-done' into maint-1.7.11

* tr/void-diff-setup-done:
diff_setup_done(): return void

12 files changed:

builtin/blame.c	diff1 \|	diff2 \|	blob \| history
builtin/checkout.c	diff1 \|	diff2 \|	blob \| history
builtin/diff.c	diff1 \|	diff2 \|	blob \| history
builtin/merge.c	diff1 \|	diff2 \|	blob \| history
diff-no-index.c	diff1 \|	diff2 \|	blob \| history
diff.c	diff1 \|	diff2 \|	blob \| history
diff.h	diff1 \|	diff2 \|	blob \| history
merge-recursive.c	diff1 \|	diff2 \|	blob \| history
notes-merge.c	diff1 \|	diff2 \|	blob \| history
revision.c	diff1 \|	diff2 \|	blob \| history
submodule.c	diff1 \|	diff2 \|	blob \| history
tree-diff.c	diff1 \|	diff2 \|	blob \| history

git clone https://git.99rst.org/PROJECT