summaryrefslogtreecommitdiffstats
path: root/git-rev-list.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2009-07-16 06:59:15 +0000
committerJunio C Hamano <junio@hera.kernel.org>2009-07-16 06:59:15 +0000
commit934e1788fda507640c6f37f45d7328973d627297 (patch)
tree399949ea266cfc74c9de7584024ac304bb101f66 /git-rev-list.txt
parent48bc1ce61affeee2942cc1290ea0aab6b6e61f91 (diff)
downloadgit-htmldocs-934e1788fda507640c6f37f45d7328973d627297.tar.gz
Autogenerated HTML docs for v1.6.4-rc1
Diffstat (limited to 'git-rev-list.txt')
-rw-r--r--git-rev-list.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/git-rev-list.txt b/git-rev-list.txt
index 1c9cc2889..a765cfa4d 100644
--- a/git-rev-list.txt
+++ b/git-rev-list.txt
@@ -14,6 +14,7 @@ SYNOPSIS
[ \--max-age=timestamp ]
[ \--min-age=timestamp ]
[ \--sparse ]
+ [ \--merges ]
[ \--no-merges ]
[ \--first-parent ]
[ \--remove-empty ]