aboutsummaryrefslogtreecommitdiff
path: root/Documentation/diff-generate-patch.txt
diff options
context:
space:
mode:
authorPetr Baudis <pasky@suse.cz>2010-02-10 02:11:49 +0100
committerJunio C Hamano <gitster@pobox.com>2010-02-12 11:32:23 -0800
commit88d9d45d071379e81e585faa95e4f28414d7d973 (patch)
tree541327549a7cadbbb324c1f791351cb711609671 /Documentation/diff-generate-patch.txt
parent8051a030617cf7d083568cca223bdaa15052c33f (diff)
downloadgit-88d9d45d071379e81e585faa95e4f28414d7d973.tar.gz
git-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 'Documentation/diff-generate-patch.txt')
-rw-r--r--Documentation/diff-generate-patch.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/diff-generate-patch.txt b/Documentation/diff-generate-patch.txt
index 0f25ba7e3..8f9a2412f 100644
--- a/Documentation/diff-generate-patch.txt
+++ b/Documentation/diff-generate-patch.txt
@@ -56,7 +56,8 @@ combined diff format
"git-diff-tree", "git-diff-files" and "git-diff" can take '-c' or
'--cc' option to produce 'combined diff'. For showing a merge commit
-with "git log -p", this is the default format.
+with "git log -p", this is the default format; you can force showing
+full diff with the '-m' option.
A 'combined diff' format looks like this:
------------