]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 187c00c) | patch
merge-tree: don't print entries that match "local"
authorJohn Keeping <john@keeping.me.uk>
Sun, 7 Apr 2013 21:07:51 +0000 (22:07 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Apr 2013 17:50:52 +0000 (10:50 -0700)
commitaacecc3b36a6cd4d2707e3f1cbd7bb4122477c64
tree077c3536de6dc869f8de4f6e1bacd0d8bbef9990tree | snapshot
parent187c00c6c58ba8916a37011b56cb0cb8f2dd1805commit | diff
merge-tree: don't print entries that match "local"

The documentation says:

the output from the command omits entries that match the
<branch1> tree.

But currently "added in branch1" and "removed in branch1" (both while
unchanged in branch2) do print output.  Change this so that the
behaviour matches the documentation.

Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/merge-tree.c diff | blob | history
t/t4300-merge-tree.sh diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.