diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-30 14:44:22 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-30 14:44:22 -0800 |
| commit | 684d0d8dcfa2288744a553fc7294c5f9f5c12026 (patch) | |
| tree | d790223199de25afa95aeb898d1b85d1e1dd3e1c /Documentation/pretty-formats.txt | |
| parent | 261fbda903762b9c47e4138312673ea25555d9e5 (diff) | |
| parent | 9fa708dab1ccf8be69a606ca4eb58e62f3ef334a (diff) | |
| download | git-684d0d8dcfa2288744a553fc7294c5f9f5c12026.tar.gz | |
Merge branch 'jc/pretty-lf'
Conflicts:
pretty.c
t/t6006-rev-list-format.sh
Diffstat (limited to 'Documentation/pretty-formats.txt')
| -rw-r--r-- | Documentation/pretty-formats.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt index 0683fb3a3d..53a9168ba7 100644 --- a/Documentation/pretty-formats.txt +++ b/Documentation/pretty-formats.txt @@ -144,6 +144,14 @@ insert an empty string unless we are traversing reflog entries (e.g., by `git log -g`). The `%d` placeholder will use the "short" decoration format if `--decorate` was not already provided on the command line. +If you add a `{plus}` (plus sign) after '%' of a placeholder, a line-feed +is inserted immediately before the expansion if and only if the +placeholder expands to a non-empty string. + +If you add a `-` (minus sign) after '%' of a placeholder, line-feeds that +immediately precede the expansion are deleted if and only if the +placeholder expands to an empty string. + * 'tformat:' + The 'tformat:' format works exactly like 'format:', except that it |