diff options
Diffstat (limited to 'man1/git-shortlog.1')
| -rw-r--r-- | man1/git-shortlog.1 | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/man1/git-shortlog.1 b/man1/git-shortlog.1 index 9bc3752ea..6470a75aa 100644 --- a/man1/git-shortlog.1 +++ b/man1/git-shortlog.1 @@ -2,12 +2,12 @@ .\" Title: git-shortlog .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 03/21/2023 +.\" Date: 03/28/2023 .\" Manual: Git Manual -.\" Source: Git 2.40.0.130.g27d43aaaf5 +.\" Source: Git 2.40.0.141.g8d90352acc .\" Language: English .\" -.TH "GIT\-SHORTLOG" "1" "03/21/2023" "Git 2\&.40\&.0\&.130\&.g27d43a" "Git Manual" +.TH "GIT\-SHORTLOG" "1" "03/28/2023" "Git 2\&.40\&.0\&.141\&.g8d9035" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -28,7 +28,7 @@ .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- .SH "NAME" -git-shortlog \- Summarize \(aqgit log\(aq output +git-shortlog \- Summarize \*(Aqgit log\*(Aq output .SH "SYNOPSIS" .sp .nf @@ -770,7 +770,7 @@ In the following, we will always refer to the same example history to illustrate / / / / / / I B C D E Y \e / / / / / - `\-\-\-\-\-\-\-\-\-\-\-\-\-\(aq X + `\-\-\-\-\-\-\-\-\-\-\-\-\-\*(Aq X .fi .if n \{\ .RE @@ -986,7 +986,7 @@ Merges are always included\&. However, their parent list is rewritten: Along eac / / / / / I B / D / \e / / / / - `\-\-\-\-\-\-\-\-\-\-\-\-\-\(aq + `\-\-\-\-\-\-\-\-\-\-\-\-\-\*(Aq .fi .if n \{\ .RE @@ -997,7 +997,7 @@ Compare to without rewriting above\&. Note that \fBE\fR was pruned away because it is TREESAME, but the parent list of P was rewritten to contain -\fBE\fR\(aqs parent +\fBE\fR\*(Aqs parent \fBI\fR\&. The same happened for \fBC\fR and @@ -1032,7 +1032,7 @@ with parent rewriting does (see above)\&. Then simplify each commit \fBC\fR to its replacement -\fBC\(aq\fR +\fBC\*(Aq\fR in the final history according to the following rules: .sp .RS 4 @@ -1044,7 +1044,7 @@ in the final history according to the following rules: .IP \(bu 2.3 .\} Set -\fBC\(aq\fR +\fBC\*(Aq\fR to \fBC\fR\&. .RE @@ -1060,9 +1060,9 @@ to Replace each parent \fBP\fR of -\fBC\(aq\fR +\fBC\*(Aq\fR with its simplification -\fBP\(aq\fR\&. In the process, drop parents that are ancestors of other parents or that are root commits TREESAME to an empty tree, and remove duplicates, but take care to never drop all parents that we are TREESAME to\&. +\fBP\*(Aq\fR\&. In the process, drop parents that are ancestors of other parents or that are root commits TREESAME to an empty tree, and remove duplicates, but take care to never drop all parents that we are TREESAME to\&. .RE .sp .RS 4 @@ -1074,7 +1074,7 @@ with its simplification .IP \(bu 2.3 .\} If after this parent rewriting, -\fBC\(aq\fR +\fBC\*(Aq\fR is a root or merge commit (has zero or >1 parents), a boundary commit, or !TREESAME, it remains\&. Otherwise, it is replaced with its only parent\&. .RE .sp @@ -1090,7 +1090,7 @@ with parent rewriting\&. The example turns into: / / / I B D \e / / - `\-\-\-\-\-\-\-\-\-\(aq + `\-\-\-\-\-\-\-\-\-\*(Aq .fi .if n \{\ .RE @@ -1111,7 +1111,7 @@ over .sp -1 .IP \(bu 2.3 .\} -\fBN\fR\(aqs parent list had +\fBN\fR\*(Aqs parent list had \fBI\fR removed, because it is an ancestor of the other parent \fBM\fR\&. Still, @@ -1127,7 +1127,7 @@ remained because it is !TREESAME\&. .sp -1 .IP \(bu 2.3 .\} -\fBP\fR\(aqs parent list similarly had +\fBP\fR\*(Aqs parent list similarly had \fBI\fR removed\&. \fBP\fR @@ -1142,7 +1142,7 @@ was then removed completely, because it had one parent and is TREESAME\&. .sp -1 .IP \(bu 2.3 .\} -\fBQ\fR\(aqs parent list had +\fBQ\fR\*(Aqs parent list had \fBY\fR simplified to \fBX\fR\&. @@ -1277,10 +1277,10 @@ A common problem users face when looking at simplified history is that a commit .nf \&.\-A\-\-\-M\-\-\-\-\-C\-\-N\-\-\-O\-\-\-P / / \e \e \e/ / / - I B \e R\-\(aq`\-Z\(aq / + I B \e R\-\*(Aq`\-Z\*(Aq / \e / \e/ / \e / /\e / - `\-\-\-X\-\-\(aq `\-\-\-Y\-\-\(aq + `\-\-\-X\-\-\*(Aq `\-\-\-Y\-\-\*(Aq .fi .if n \{\ .RE @@ -1310,10 +1310,10 @@ When using \fB\-\-full\-history\fR, Git walks every edge\&. This will discover t .nf \&.\-A\-\-\-M\-\-\-\-\-\-\-\-N\-\-\-O\-\-\-P / / \e \e \e/ / / - I B \e R\-\(aq`\-\-\(aq / + I B \e R\-\*(Aq`\-\-\*(Aq / \e / \e/ / \e / /\e / - `\-\-\-X\-\-\(aq `\-\-\-\-\-\-\(aq + `\-\-\-X\-\-\*(Aq `\-\-\-\-\-\-\*(Aq .fi .if n \{\ .RE @@ -1333,7 +1333,7 @@ When using the \fB\-\-simplify\-merges\fR option, the commits \fBO\fR and \fBP\f I B R \e / / \e / / - `\-\-\-X\-\-\(aq + `\-\-\-X\-\-\*(Aq .fi .if n \{\ .RE @@ -1393,7 +1393,7 @@ is paired with I B R \e / / \e / / - `\-\-\-X\-\-\(aq + `\-\-\-X\-\-\*(Aq .fi .if n \{\ .RE |