diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-07-24 03:16:05 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-02 10:00:42 +0400 |
| commit | b1264da8637dc991b84e329c2c4958c1332d069f (patch) | |
| tree | 93aee511505ea2d50d3c53a4cfb1ec77db8dcd0f /Documentation/rev-list-options.txt | |
| parent | 31f4e768a4b53419a1de9c4006c7b3747fc356eb (diff) | |
Documentation: clarify diff --cc
The definition of an "uninteresting" hunk was not in line with reality.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/rev-list-options.txt')
| -rw-r--r-- | Documentation/rev-list-options.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index 37dd1d61ea..f69260f4c0 100644 --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.txt @@ -108,9 +108,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:: |