summaryrefslogtreecommitdiffstats
path: root/rev-list-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-12-10 15:15:09 -0800
committerJunio C Hamano <gitster@pobox.com>2019-12-10 15:15:09 -0800
commitb48968522932c1f3142591d9f2a3421833de78af (patch)
tree648febe954b673570a636b2b19ac76b570cb67c2 /rev-list-options.txt
parent59e8824741436987ea088ff1f3c7c82d6fe48fc9 (diff)
downloadgit-htmldocs-b48968522932c1f3142591d9f2a3421833de78af.tar.gz
Autogenerated HTML docs for v2.24.1-485-gad05a
Diffstat (limited to 'rev-list-options.txt')
-rw-r--r--rev-list-options.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/rev-list-options.txt b/rev-list-options.txt
index f63ced607..bfd02ade9 100644
--- a/rev-list-options.txt
+++ b/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