diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-12-10 22:11:42 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-10 22:11:43 +0100 |
| commit | d37cfe3b5c7ef64aff0459ce2730464120c97f30 (patch) | |
| tree | f94340d8102d1062ae8aa585b197c4ac1569a7e7 /Documentation/rev-list-options.txt | |
| parent | Merge branch 'dl/submodule-set-url' (diff) | |
| parent | SubmittingPatches: use `--pretty=reference` (diff) | |
| download | git-d37cfe3b5c7ef64aff0459ce2730464120c97f30.tar.xz git-d37cfe3b5c7ef64aff0459ce2730464120c97f30.zip | |
Merge branch 'dl/pretty-reference'
"git log" family learned "--pretty=reference" that gives the name
of a commit in the format that is often used to refer to it in log
messages.
* dl/pretty-reference:
SubmittingPatches: use `--pretty=reference`
pretty: implement 'reference' format
pretty: add struct cmt_fmt_map::default_date_mode_type
pretty: provide short date format
t4205: cover `git log --reflog -z` blindspot
pretty.c: inline initalize format_context
revision: make get_revision_mark() return const pointer
completion: complete `tformat:` pretty format
SubmittingPatches: remove dq from commit reference
pretty-formats.txt: use generic terms for hash
SubmittingPatches: use generic terms for hash
Diffstat (limited to 'Documentation/rev-list-options.txt')
| -rw-r--r-- | Documentation/rev-list-options.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index f63ced607c..bfd02ade99 100644 --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.txt @@ -269,7 +269,7 @@ list. exclude (that is, '{caret}commit', 'commit1..commit2', and 'commit1\...commit2' notations cannot be used). + -With `--pretty` format other than `oneline` (for obvious reasons), +With `--pretty` format other than `oneline` and `reference` (for obvious reasons), this causes the output to have two extra lines of information taken from the reflog. The reflog designator in the output may be shown as `ref@{Nth}` (where `Nth` is the reverse-chronological index in the @@ -293,6 +293,8 @@ Under `--pretty=oneline`, the commit message is prefixed with this information on the same line. This option cannot be combined with `--reverse`. See also linkgit:git-reflog[1]. ++ +Under `--pretty=reference`, this information will not be shown at all. --merge:: After a failed merge, show refs that touch files having a |