diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-09-19 13:51:37 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-09-19 13:51:38 -0700 |
commit | f0b2db228b9abf41eb1b2ba88cb42c0ac5a82613 (patch) | |
tree | d04c17cd343f7c5b2a9bb12468ed610957edfa23 /Documentation/pretty-formats.txt | |
parent | Merge tag 'l10n-2.10.0-rnd2.3' of git://github.com/git-l10n/git-po into maint (diff) | |
parent | doc: revisions: sort examples and fix alignment of the unchanged (diff) | |
download | tgif-f0b2db228b9abf41eb1b2ba88cb42c0ac5a82613.tar.xz |
Merge branch 'po/range-doc' into maint
Clarify various ways to specify the "revision ranges" in the
documentation.
* po/range-doc:
doc: revisions: sort examples and fix alignment of the unchanged
doc: revisions: show revision expansion in examples
doc: revisions - clarify reachability examples
doc: revisions - define `reachable`
doc: gitrevisions - clarify 'latter case' is revision walk
doc: gitrevisions - use 'reachable' in page description
doc: revisions: single vs multi-parent notation comparison
doc: revisions: extra clarification of <rev>^! notation effects
doc: revisions: give headings for the two and three dot notations
doc: show the actual left, right, and boundary marks
doc: revisions - name the left and right sides
doc: use 'symmetric difference' consistently
Diffstat (limited to 'Documentation/pretty-formats.txt')
-rw-r--r-- | Documentation/pretty-formats.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt index b95d67ec01..a942d57f73 100644 --- a/Documentation/pretty-formats.txt +++ b/Documentation/pretty-formats.txt @@ -172,7 +172,7 @@ endif::git-rev-list[] respecting the `auto` settings of the former if we are going to a terminal). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again. -- '%m': left, right or boundary mark +- '%m': left (`<`), right (`>`) or boundary (`-`) mark - '%n': newline - '%%': a raw '%' - '%x00': print a byte from a hex code |