diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-10-30 20:18:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-10-30 20:18:31 -0700 |
| commit | 5f809ff50921bee44bbf88c49056e7d145c0c35f (patch) | |
| tree | 451ba24442900b54c90264056998effaf25cd4eb /Documentation | |
| parent | d39d667169fda640065d48b70288c3342bd3195d (diff) | |
| parent | b7b10385a84c741a4fe219807c9511f69403640a (diff) | |
| download | git-5f809ff50921bee44bbf88c49056e7d145c0c35f.tar.gz git-5f809ff50921bee44bbf88c49056e7d145c0c35f.tar.xz | |
fixup tr/stash-format merge
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-stash.txt | 3 | ||||
| -rw-r--r-- | Documentation/pretty-formats.txt | 9 |
2 files changed, 10 insertions, 2 deletions
diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt index fafe728f8..3f14b727b 100644 --- a/Documentation/git-stash.txt +++ b/Documentation/git-stash.txt @@ -78,8 +78,7 @@ stash@{1}: On master: 9cc0589... Add git-stash ---------------------------------------------------------------- + The command takes options applicable to the 'git-log' -command to control what is shown and how. If no options are set, the -default is `-n 10`. See linkgit:git-log[1]. +command to control what is shown and how. See linkgit:git-log[1]. show [<stash>]:: diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt index 2a845b1e5..38b990479 100644 --- a/Documentation/pretty-formats.txt +++ b/Documentation/pretty-formats.txt @@ -123,6 +123,9 @@ The placeholders are: - '%s': subject - '%f': sanitized subject line, suitable for a filename - '%b': body +- '%gD': reflog selector, e.g., `refs/stash@\{1\}` +- '%gd': shortened reflog selector, e.g., `stash@\{1\}` +- '%gs': reflog subject - '%Cred': switch color to red - '%Cgreen': switch color to green - '%Cblue': switch color to blue @@ -132,6 +135,12 @@ The placeholders are: - '%n': newline - '%x00': print a byte from a hex code +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. + * 'tformat:' + The 'tformat:' format works exactly like 'format:', except that it |