git.oblomov.eu Git - git/commit

author	Junio C Hamano <gitster@pobox.com>
	Thu, 7 Mar 2019 00:59:54 +0000 (09:59 +0900)
committer	Junio C Hamano <gitster@pobox.com>
	Thu, 7 Mar 2019 00:59:54 +0000 (09:59 +0900)
commit	c425d361f5bf46d99cd96d7eac3488ebb2e92b60
tree	9cfdd1b91fc759cb1e561c6302bbd9cfe37245ba	tree \| snapshot
parent	cf0879f7e98d2213503622f780d2ab0dd3f93477	commit \| diff
parent	d76ce4f734634f47b467b7f6eea11d6bf8c81f22	commit \| diff

Merge branch 'en/combined-all-paths'

Output from "diff --cc" did not show the original paths when the
merge involved renames. A new option adds the paths in the
original trees to the output.

* en/combined-all-paths:
log,diff-tree: add --combined-all-paths option

Documentation/git-diff-tree.txt	diff1 \|	diff2 \|	blob \| history
Documentation/rev-list-options.txt	diff1 \|	diff2 \|	blob \| history
builtin/diff-tree.c	diff1 \|	diff2 \|	blob \| history
combine-diff.c	diff1 \|	diff2 \|	blob \| history
diff.h	diff1 \|	diff2 \|	blob \| history
revision.c	diff1 \|	diff2 \|	blob \| history
revision.h	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

Documentation/git-diff-tree.txt	diff1 \|	diff2 \|	blob \| history
Documentation/rev-list-options.txt	diff1 \|	diff2 \|	blob \| history
builtin/diff-tree.c	diff1 \|	diff2 \|	blob \| history
combine-diff.c	diff1 \|	diff2 \|	blob \| history
diff.h	diff1 \|	diff2 \|	blob \| history
revision.c	diff1 \|	diff2 \|	blob \| history
revision.h	diff1 \|	diff2 \|	blob \| history