summaryrefslogtreecommitdiffstats
path: root/git-rerere.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-10-28 11:56:06 -0700
committerJunio C Hamano <gitster@pobox.com>2022-10-28 11:56:06 -0700
commitcf9c77377796343e741a25077f837f607513c7bb (patch)
tree9a341606b216f4ed10313aedfeb7e19ecc02d01b /git-rerere.txt
parentf1d1635ee1970ac33c5a760b94d069cd7bfc4e99 (diff)
downloadgit-htmldocs-cf9c77377796343e741a25077f837f607513c7bb.tar.gz
Autogenerated HTML docs for v2.38.1-280-g63bba
Diffstat (limited to 'git-rerere.txt')
-rw-r--r--git-rerere.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rerere.txt b/git-rerere.txt
index 4cfc88337..992b46927 100644
--- a/git-rerere.txt
+++ b/git-rerere.txt
@@ -8,7 +8,7 @@ git-rerere - Reuse recorded resolution of conflicted merges
SYNOPSIS
--------
[verse]
-'git rerere' ['clear'|'forget' <pathspec>|'diff'|'remaining'|'status'|'gc']
+'git rerere' [clear | forget <pathspec>... | diff | status | remaining | gc]
DESCRIPTION
-----------