diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-09-29 12:36:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-29 12:36:09 -0700 |
| commit | b8e533f12acec63242c5405286fbbcfa66eecfdd (patch) | |
| tree | 32ededef297ace728b1c59a5425b8b383eae75a8 /Documentation/pretty-formats.txt | |
| parent | a9583afc1df1df10d60d2b81fd4b0976bc67ca4e (diff) | |
| parent | 9271095cc5571e306d709ebf8eb7f0a388254d9d (diff) | |
| download | git-b8e533f12acec63242c5405286fbbcfa66eecfdd.tar.gz | |
Merge branch 'hj/pretty-naked-decoration'
The pretty-format specifier "%d", which expanded to " (tagname)"
for a tagged commit, gained a cousin "%D" that just gives the
"tagname" without frills.
* hj/pretty-naked-decoration:
pretty: add %D format specifier
Diffstat (limited to 'Documentation/pretty-formats.txt')
| -rw-r--r-- | Documentation/pretty-formats.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt index 6c30723740..eecc39dec9 100644 --- a/Documentation/pretty-formats.txt +++ b/Documentation/pretty-formats.txt @@ -130,6 +130,7 @@ The placeholders are: - '%ci': committer date, ISO 8601-like format - '%cI': committer date, strict ISO 8601 format - '%d': ref names, like the --decorate option of linkgit:git-log[1] +- '%D': ref names without the " (", ")" wrapping. - '%e': encoding - '%s': subject - '%f': sanitized subject line, suitable for a filename @@ -184,8 +185,9 @@ The placeholders are: NOTE: Some placeholders may depend on other options given to the revision traversal engine. For example, the `%g*` reflog options will 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. +`git log -g`). The `%d` and `%D` placeholders will use the "short" +decoration format if `--decorate` was not already provided on the command +line. If you add a `+` (plus sign) after '%' of a placeholder, a line-feed is inserted immediately before the expansion if and only if the |