diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-12-05 20:52:44 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-05 20:52:44 (GMT) |
| commit | f3c7bfdde23f65f5ac8577afacffeb083fc8497f (patch) | |
| tree | 7f78aeb5960f987529c0ecd42b96cb1f453a9fa9 /Documentation/rev-list-options.txt | |
| parent | 9502b616f187c567b93db69cd9c6f0028019bd15 (diff) | |
| parent | 5b583e6a09dc2095160a4489502577a5a20b400e (diff) | |
| download | git-f3c7bfdde23f65f5ac8577afacffeb083fc8497f.zip git-f3c7bfdde23f65f5ac8577afacffeb083fc8497f.tar.gz git-f3c7bfdde23f65f5ac8577afacffeb083fc8497f.tar.bz2 | |
Merge branch 'dl/range-diff-with-notes'
"git range-diff" learned to take the "--notes=<ref>" and the
"--no-notes" options to control the commit notes included in the
log message that gets compared.
* dl/range-diff-with-notes:
format-patch: pass notes configuration to range-diff
range-diff: pass through --notes to `git log`
range-diff: output `## Notes ##` header
t3206: range-diff compares logs with commit notes
t3206: s/expected/expect/
t3206: disable parameter substitution in heredoc
t3206: remove spaces after redirect operators
pretty-options.txt: --notes accepts a ref instead of treeish
rev-list-options.txt: remove reference to --show-notes
argv-array: add space after `while`
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 e37df92..f63ced6 100644 --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.txt @@ -58,7 +58,7 @@ endif::git-rev-list[] `--all-match`). ifndef::git-rev-list[] + -When `--show-notes` is in effect, the message from the notes is +When `--notes` is in effect, the message from the notes is matched as if it were part of the log message. endif::git-rev-list[] |