Re: [PATCH] bring description of git diff --cc up to date
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:45:00
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · [PATCH] bring description of git diff --cc up to date · Jonathan Nieder <hidden>
- 2016-06-15 · Re: [PATCH] bring description of git diff --cc up to date · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH] bring description of git diff --cc up to date · Jonathan Nieder <hidden>
- 2016-06-15 · Re: [PATCH] bring description of git diff --cc up to date · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH] bring description of git diff --cc up to date · Junio C Hamano <hidden>
Jonathan Nieder [off-list ref] writes:
On Tue, 22 Jul 2008, Junio C Hamano wrote: Here's another attempt. I grimace at the sound of it, but it might be more clear.
Let's just do this. I think it is clear enough. Documentation/git-diff-tree.txt | 10 +++++----- Documentation/rev-list-options.txt | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt
index 0e45b58..8c8f35b 100644
--- a/Documentation/git-diff-tree.txt
+++ b/Documentation/git-diff-tree.txt@@ -93,11 +93,11 @@ include::pretty-options.txt[] This flag changes the way a merge commit patch is displayed, in a similar way to the '-c' option. It implies the '-c' and '-p' options and further compresses the patch output - by omitting hunks that show differences from only one - parent, or show the same change from all but one parent - for an Octopus merge. When this optimization makes all - hunks disappear, the commit itself and the commit log - message is not shown, just like in any other "empty diff" case. + by omitting uninteresting hunks whose the contents in the parents + have only two variants and the merge result picks one of them + without modification. When all hunks are uninteresting, the commit + itself and the commit log message is not shown, just like in any other + "empty diff" case. --always:: Show the commit itself and the commit log message even
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index b6f5d87..3aa3809 100644
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt@@ -112,9 +112,9 @@ options may be given. See linkgit:git-diff-files[1] for more options. --cc:: This flag implies the '-c' options and further compresses the - patch output by omitting hunks that show differences from only - one parent, or show the same change from all but one parent for - an Octopus merge. + patch output by omitting uninteresting hunks whose contents in + the parents have only two variants and the merge result picks + one of them without modification. -r::