diff options
Diffstat (limited to 'man1/git-rerere.1')
| -rw-r--r-- | man1/git-rerere.1 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/man1/git-rerere.1 b/man1/git-rerere.1 index 825a61536..41fed53ab 100644 --- a/man1/git-rerere.1 +++ b/man1/git-rerere.1 @@ -2,12 +2,12 @@ .\" Title: git-rerere .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 10/27/2022 +.\" Date: 10/28/2022 .\" Manual: Git Manual -.\" Source: Git 2.38.1.236.g5af5e54106 +.\" Source: Git 2.38.1.280.g63bba4fdd8 .\" Language: English .\" -.TH "GIT\-RERERE" "1" "10/27/2022" "Git 2\&.38\&.1\&.236\&.g5af5e5" "Git Manual" +.TH "GIT\-RERERE" "1" "10/28/2022" "Git 2\&.38\&.1\&.280\&.g63bba4" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -32,7 +32,7 @@ git-rerere \- Reuse recorded resolution of conflicted merges .SH "SYNOPSIS" .sp .nf -\fIgit rerere\fR [\fIclear\fR|\fIforget\fR <pathspec>|\fIdiff\fR|\fIremaining\fR|\fIstatus\fR|\fIgc\fR] +\fIgit rerere\fR [clear | forget <pathspec>\&... | diff | status | remaining | gc] .fi .sp .SH "DESCRIPTION" |