summaryrefslogtreecommitdiff
path: root/Documentation/git-rev-list.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-01-20 07:21:32 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-01-21 05:32:31 (GMT)
commit911cedc95c2990b75f010d0d7bdbbc5911831708 (patch)
treed11f87f8f6a8b12d50192c00a127813936d9551a /Documentation/git-rev-list.txt
parentdb055e65d20b20f8f32eb85ee1a2417d3b95c1c7 (diff)
downloadgit-911cedc95c2990b75f010d0d7bdbbc5911831708.zip
git-911cedc95c2990b75f010d0d7bdbbc5911831708.tar.gz
git-911cedc95c2990b75f010d0d7bdbbc5911831708.tar.bz2
log --walk-reflog: documentation
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-rev-list.txt')
-rw-r--r--Documentation/git-rev-list.txt15
1 files changed, 15 insertions, 0 deletions
diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt
index 86c94e7..fcc540b 100644
--- a/Documentation/git-rev-list.txt
+++ b/Documentation/git-rev-list.txt
@@ -190,6 +190,21 @@ limiting may be applied.
In addition to the '<commit>' listed on the command
line, read them from the standard input.
+--walk-reflogs::
+
+ Instead of walking the commit ancestry chain, walk
+ reflog entries from the most recent one to older ones.
+ When this option is used you cannot specify commits to
+ exclude (that is, '{caret}commit', 'commit1..commit2',
+ nor 'commit1...commit2' notations cannot be used).
++
+With '\--pretty' format other than oneline (for obvious reasons),
+this causes the output to have two extra lines of information
+taken from the reflog. By default, 'commit@{Nth}' notation is
+used in the output. When the starting commit is specified as
+'commit@{now}', output also uses 'commit@{timestamp}' notation
+instead.
+
--merge::
After a failed merge, show refs that touch files having a