diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-07-24 04:03:33 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-07-24 04:03:33 +0000 |
| commit | ccc2f7606414a57fc7f34d2f88f8fb2246918d6d (patch) | |
| tree | 086aa0acaa44a0fadc1de3344e5121f865623f32 /rev-list-options.txt | |
| parent | 0868a302deebe5253106fdf9af00c82e2c711e66 (diff) | |
| download | git-htmldocs-ccc2f7606414a57fc7f34d2f88f8fb2246918d6d.tar.gz | |
Autogenerated HTML docs for v1.6.0-rc0-42-g186458
Diffstat (limited to 'rev-list-options.txt')
| -rw-r--r-- | rev-list-options.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rev-list-options.txt b/rev-list-options.txt index b6f5d87e7..3aa38097e 100644 --- a/rev-list-options.txt +++ b/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:: |