summaryrefslogtreecommitdiff
path: root/t/t4033-diff-patience.sh
diff options
context:
space:
mode:
authorLibravatar Petr Baudis <pasky@suse.cz>2010-02-10 02:11:49 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-02-12 11:32:23 -0800
commit88d9d45d071379e81e585faa95e4f28414d7d973 (patch)
tree541327549a7cadbbb324c1f791351cb711609671 /t/t4033-diff-patience.sh
parentMerge git://repo.or.cz/git-gui (diff)
downloadtgif-88d9d45d071379e81e585faa95e4f28414d7d973.tar.xz
git log -p -m: document -m and honor --first-parent
git log -p -m is used to show one merge entry per parent, with an appropriate diff; this can be useful when examining histories where full set of changes introduced by a merged branch is interesting, not only the conflicts. This patch properly documents the -m switch, which has so far been mentioned only as a fairly special diff-tree flag. It also makes the code show full patch entry only for the first parent when --first-parent is used. Thus: git log -p -m --first-parent will show the history from the "main branch perspective", while also including full diff of changes introduced by other merged in branches. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4033-diff-patience.sh')
0 files changed, 0 insertions, 0 deletions