diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-06-22 09:45:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-22 09:45:22 -0700 |
| commit | 223a923c37f76ee91eb6a9cb77ce6d31dcf939cc (patch) | |
| tree | b56a1133686e8a283ed13141459a73aa7056c74b /Documentation | |
| parent | Merge branch 'jn/gitweb-return-or-exit-cleanup' (diff) | |
| parent | pretty: Introduce ' ' modifier to add space if non-empty (diff) | |
| download | tgif-223a923c37f76ee91eb6a9cb77ce6d31dcf939cc.tar.xz | |
Merge branch 'mg/pretty-magic-space'
* mg/pretty-magic-space:
pretty: Introduce ' ' modifier to add space if non-empty
Conflicts:
pretty.c
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/pretty-formats.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt index 8c68ce94f9..561cc9f7d7 100644 --- a/Documentation/pretty-formats.txt +++ b/Documentation/pretty-formats.txt @@ -159,6 +159,10 @@ 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. +If you add a ` ` (space) after '%' of a placeholder, a space +is inserted immediately before the expansion if and only if the +placeholder expands to a non-empty string. + * 'tformat:' + The 'tformat:' format works exactly like 'format:', except that it |