diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-07-23 20:55:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-23 20:55:22 -0700 |
| commit | 90683976ce83089284ebec3c93aa23d9eb9128a0 (patch) | |
| tree | b16f2a32bc9e264efdf98b2b9536404d9682b8ac /Documentation/rev-list-options.txt | |
| parent | Merge branch 'tg/ce-namelen-field' (diff) | |
| parent | doc: A few minor copy edits. (diff) | |
| download | tgif-90683976ce83089284ebec3c93aa23d9eb9128a0.tar.xz | |
Merge branch 'sn/doc-typofix'
* sn/doc-typofix:
doc: A few minor copy edits.
Diffstat (limited to 'Documentation/rev-list-options.txt')
| -rw-r--r-- | Documentation/rev-list-options.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index 84e34b1aba..d9b2b5b2e0 100644 --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.txt @@ -760,7 +760,7 @@ options may be given. See linkgit:git-diff-files[1] for more options. --cc:: - This flag implies the '-c' options and further compresses the + This flag implies the '-c' option and further compresses the 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. |