Re: [PATCH] bring description of git diff --cc up to date
From: Jonathan Nieder <hidden>
Date: 2016-06-15 22:44:59
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
Possibly related (same subject, not in this thread)
- 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 · [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>
Junio C Hamano wrote:
Actually Linus talks about "when you have two versions to choose from, and if the result matches one of them, then it is not interesting".
That is much better - thanks. (The description by Linus I was referring to was from <http://thread.gmane.org/gmane.comp.version-control.git/89415>: "So "--cc" only shows output if: the merge itself actually changed something from _all_ parents" - which is not too misleading since the two-parent case is the usual one.) How about this, then?
--- %< ---Subject: document diff --cc's long-ago-changed semantics
In February 2006 [1], the definition of "interesting hunk" for
git's "compact combined diff" format changed, without any
corresponding change in documentation. This patch brings the
documentation up to date.
[1] commit bf1c32bdec8223785c779779d0a660a099f69a63
combine-diff: update --cc "uninteresting hunks" logic
---
Documentation/git-diff-tree.txt | 12 +++++++-----
Documentation/rev-list-options.txt | 9 +++++----
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt
index 0e45b58..14dc70d 100644
--- a/Documentation/git-diff-tree.txt
+++ b/Documentation/git-diff-tree.txt@@ -92,12 +92,14 @@ include::pretty-options.txt[] --cc:: 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 + and '-p' options and makes the patch output + even more compact by omitting uninteresting hunks. A hunk is + considered uninteresting if the person merging had two versions + to choose between among all of the parents and the result shows + no changes from one of those versions. + 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. + message are 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..c61d05d 100644
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt@@ -111,10 +111,11 @@ 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. + This flag implies the '-c' option and makes the patch output + even more compact by omitting uninteresting hunks. A hunk is + considered uninteresting if the person merging had two versions + to choose between among all of the parents and the result shows + no changes from one of those versions. -r::
--
1.5.6.3.549.g8ca11