Autogenerated manpages for v2.21.0-313-ge35b8
diff --git a/man1/git-add.1 b/man1/git-add.1
index 6873b51..e50c59e 100644
--- a/man1/git-add.1
+++ b/man1/git-add.1
@@ -2,12 +2,12 @@
.\" Title: git-add
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 02/24/2019
+.\" Date: 04/10/2019
.\" Manual: Git Manual
-.\" Source: Git 2.21.0
+.\" Source: Git 2.21.0.313.ge35b8cb8e2
.\" Language: English
.\"
-.TH "GIT\-ADD" "1" "02/24/2019" "Git 2\&.21\&.0" "Git Manual"
+.TH "GIT\-ADD" "1" "04/10/2019" "Git 2\&.21\&.0\&.313\&.ge35b8c" "Git Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -195,9 +195,6 @@
.RS 4
This option can be used to separate command\-line options from the list of files, (useful when filenames might be mistaken for command\-line options)\&.
.RE
-.SH "CONFIGURATION"
-.sp
-The optional configuration variable \fBcore\&.excludesFile\fR indicates a path to a file containing patterns of file names to exclude from git\-add, similar to $GIT_DIR/info/exclude\&. Patterns in the exclude file are used in addition to those in info/exclude\&. See \fBgitignore\fR(5)\&.
.SH "EXAMPLES"
.sp
.RS 4
diff --git a/man1/git-clean.1 b/man1/git-clean.1
index 110ca82..8a5e926 100644
--- a/man1/git-clean.1
+++ b/man1/git-clean.1
@@ -2,12 +2,12 @@
.\" Title: git-clean
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 02/24/2019
+.\" Date: 04/10/2019
.\" Manual: Git Manual
-.\" Source: Git 2.21.0
+.\" Source: Git 2.21.0.313.ge35b8cb8e2
.\" Language: English
.\"
-.TH "GIT\-CLEAN" "1" "02/24/2019" "Git 2\&.21\&.0" "Git Manual"
+.TH "GIT\-CLEAN" "1" "04/10/2019" "Git 2\&.21\&.0\&.313\&.ge35b8c" "Git Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -73,14 +73,16 @@
.PP
\-e <pattern>, \-\-exclude=<pattern>
.RS 4
-In addition to those found in \&.gitignore (per directory) and $GIT_DIR/info/exclude, also consider these patterns to be in the set of the ignore rules in effect\&.
+Use the given exclude pattern in addition to the standard ignore rules (see
+\fBgitignore\fR(5))\&.
.RE
.PP
\-x
.RS 4
-Don\(cqt use the standard ignore rules read from \&.gitignore (per directory) and $GIT_DIR/info/exclude, but do still use the ignore rules given with
+Don\(cqt use the standard ignore rules (see
+\fBgitignore\fR(5)), but still use the ignore rules given with
\fB\-e\fR
-options\&. This allows removing all untracked files, including build products\&. This can be used (possibly in conjunction with
+options from the command line\&. This allows removing all untracked files, including build products\&. This can be used (possibly in conjunction with
\fIgit reset\fR) to create a pristine working directory to test a clean build\&.
.RE
.PP
diff --git a/man1/git-config.1 b/man1/git-config.1
index 4fd4f1d..46224a8 100644
--- a/man1/git-config.1
+++ b/man1/git-config.1
@@ -2,12 +2,12 @@
.\" Title: git-config
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 03/20/2019
+.\" Date: 04/10/2019
.\" Manual: Git Manual
-.\" Source: Git 2.21.0.196.g041f5ea1cf
+.\" Source: Git 2.21.0.313.ge35b8cb8e2
.\" Language: English
.\"
-.TH "GIT\-CONFIG" "1" "03/20/2019" "Git 2\&.21\&.0\&.196\&.g041f5e" "Git Manual"
+.TH "GIT\-CONFIG" "1" "04/10/2019" "Git 2\&.21\&.0\&.313\&.ge35b8c" "Git Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -2339,7 +2339,10 @@
\fBgit-rebase\fR(1)
for details)\&.
.sp
-When preserve, also pass
+When
+\fBpreserve\fR
+(deprecated in favor of
+\fBmerges\fR), also pass
\fB\-\-preserve\-merges\fR
along to
\fIgit rebase\fR
@@ -6159,7 +6162,10 @@
\fBgit-rebase\fR(1)
for details)\&.
.sp
-When preserve, also pass
+When
+\fBpreserve\fR
+(deprecated in favor of
+\fBmerges\fR), also pass
\fB\-\-preserve\-merges\fR
along to
\fIgit rebase\fR
diff --git a/man1/git-rebase.1 b/man1/git-rebase.1
index 7e63014..2cb9e54 100644
--- a/man1/git-rebase.1
+++ b/man1/git-rebase.1
@@ -2,12 +2,12 @@
.\" Title: git-rebase
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 03/11/2019
+.\" Date: 04/10/2019
.\" Manual: Git Manual
-.\" Source: Git 2.21.0.155.ge902e9bcae
+.\" Source: Git 2.21.0.313.ge35b8cb8e2
.\" Language: English
.\"
-.TH "GIT\-REBASE" "1" "03/11/2019" "Git 2\&.21\&.0\&.155\&.ge902e9" "Git Manual"
+.TH "GIT\-REBASE" "1" "04/10/2019" "Git 2\&.21\&.0\&.313\&.ge35b8c" "Git Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -645,7 +645,7 @@
.sp
The
\fB\-\-rebase\-merges\fR
-mode is similar in spirit to
+mode is similar in spirit to the deprecated
\fB\-\-preserve\-merges\fR, but in contrast to that option works well in interactive rebases: commits can be reordered, inserted and dropped at will\&.
.sp
It is currently only possible to recreate the merge commits using the
@@ -659,7 +659,9 @@
.PP
\-p, \-\-preserve\-merges
.RS 4
-Recreate merge commits instead of flattening the history by replaying commits a merge commit introduces\&. Merge conflict resolutions or manual amendments to merge commits are not preserved\&.
+[DEPRECATED: use
+\fB\-\-rebase\-merges\fR
+instead] Recreate merge commits instead of flattening the history by replaying commits a merge commit introduces\&. Merge conflict resolutions or manual amendments to merge commits are not preserved\&.
.sp
This uses the
\fB\-\-interactive\fR
@@ -1840,7 +1842,7 @@
.sp
.SH "BUGS"
.sp
-The todo list presented by \fB\-\-preserve\-merges \-\-interactive\fR does not represent the topology of the revision graph\&. Editing commits and rewording their commit messages should work fine, but attempts to reorder commits tend to produce counterintuitive results\&. Use \fB\-\-rebase\-merges\fR in such scenarios instead\&.
+The todo list presented by the deprecated \fB\-\-preserve\-merges \-\-interactive\fR does not represent the topology of the revision graph (use \fB\-\-rebase\-merges\fR instead)\&. Editing commits and rewording their commit messages should work fine, but attempts to reorder commits tend to produce counterintuitive results\&. Use \fB\-\-rebase\-merges\fR in such scenarios instead\&.
.sp
For example, an attempt to rearrange
.sp
diff --git a/man1/git-reset.1 b/man1/git-reset.1
index 1ccdb7f..367eec3 100644
--- a/man1/git-reset.1
+++ b/man1/git-reset.1
@@ -2,12 +2,12 @@
.\" Title: git-reset
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 02/24/2019
+.\" Date: 04/10/2019
.\" Manual: Git Manual
-.\" Source: Git 2.21.0
+.\" Source: Git 2.21.0.313.ge35b8cb8e2
.\" Language: English
.\"
-.TH "GIT\-RESET" "1" "02/24/2019" "Git 2\&.21\&.0" "Git Manual"
+.TH "GIT\-RESET" "1" "04/10/2019" "Git 2\&.21\&.0\&.313\&.ge35b8c" "Git Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -617,7 +617,7 @@
.RE
.\}
.sp
-\fBreset \-\-merge\fR is meant to be used when resetting out of a conflicted merge\&. Any mergy operation guarantees that the working tree file that is involved in the merge does not have local change wrt the index before it starts, and that it writes the result out to the working tree\&. So if we see some difference between the index and the target and also between the index and the working tree, then it means that we are not resetting out from a state that a mergy operation left after failing with a conflict\&. That is why we disallow \fB\-\-merge\fR option in this case\&.
+\fBreset \-\-merge\fR is meant to be used when resetting out of a conflicted merge\&. Any mergy operation guarantees that the working tree file that is involved in the merge does not have a local change with respect to the index before it starts, and that it writes the result out to the working tree\&. So if we see some difference between the index and the target and also between the index and the working tree, then it means that we are not resetting out from a state that a mergy operation left after failing with a conflict\&. That is why we disallow \fB\-\-merge\fR option in this case\&.
.sp
\fBreset \-\-keep\fR is meant to be used when removing some of the last commits in the current branch while keeping changes in the working tree\&. If there could be conflicts between the changes in the commit we want to remove and the changes in the working tree we want to keep, the reset is disallowed\&. That\(cqs why it is disallowed if there are both changes between the working tree and \fBHEAD\fR, and between \fBHEAD\fR and the target\&. To be safe, it is also disallowed when there are unmerged entries\&.
.sp
diff --git a/man5/gitignore.5 b/man5/gitignore.5
index 7e4a10f..2500fca 100644
--- a/man5/gitignore.5
+++ b/man5/gitignore.5
@@ -2,12 +2,12 @@
.\" Title: gitignore
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 02/24/2019
+.\" Date: 04/10/2019
.\" Manual: Git Manual
-.\" Source: Git 2.21.0
+.\" Source: Git 2.21.0.313.ge35b8cb8e2
.\" Language: English
.\"
-.TH "GITIGNORE" "5" "02/24/2019" "Git 2\&.21\&.0" "Git Manual"
+.TH "GITIGNORE" "5" "04/10/2019" "Git 2\&.21\&.0\&.313\&.ge35b8c" "Git Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -281,6 +281,9 @@
.\}
Other consecutive asterisks are considered regular asterisks and will match according to the previous rules\&.
.RE
+.SH "CONFIGURATION"
+.sp
+The optional configuration variable \fBcore\&.excludesFile\fR indicates a path to a file containing patterns of file names to exclude, similar to \fB$GIT_DIR/info/exclude\fR\&. Patterns in the exclude file are used in addition to those in \fB$GIT_DIR/info/exclude\fR\&.
.SH "NOTES"
.sp
The purpose of gitignore files is to ensure that certain files not tracked by Git remain untracked\&.
