summaryrefslogtreecommitdiffstats
path: root/man1/git-log.1
diff options
context:
space:
mode:
Diffstat (limited to 'man1/git-log.1')
-rw-r--r--man1/git-log.154
1 files changed, 27 insertions, 27 deletions
diff --git a/man1/git-log.1 b/man1/git-log.1
index 70af272b6..3ac8b5349 100644
--- a/man1/git-log.1
+++ b/man1/git-log.1
@@ -2,12 +2,12 @@
.\" Title: git-log
.\" 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\-LOG" "1" "03/21/2023" "Git 2\&.40\&.0\&.130\&.g27d43a" "Git Manual"
+.TH "GIT\-LOG" "1" "03/28/2023" "Git 2\&.40\&.0\&.141\&.g8d9035" "Git Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -865,7 +865,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
@@ -1081,7 +1081,7 @@ Merges are always included\&. However, their parent list is rewritten: Along eac
/ / / / /
I B / D /
\e / / / /
- `\-\-\-\-\-\-\-\-\-\-\-\-\-\(aq
+ `\-\-\-\-\-\-\-\-\-\-\-\-\-\*(Aq
.fi
.if n \{\
.RE
@@ -1092,7 +1092,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
@@ -1127,7 +1127,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
@@ -1139,7 +1139,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
@@ -1155,9 +1155,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
@@ -1169,7 +1169,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
@@ -1185,7 +1185,7 @@ with parent rewriting\&. The example turns into:
/ / /
I B D
\e / /
- `\-\-\-\-\-\-\-\-\-\(aq
+ `\-\-\-\-\-\-\-\-\-\*(Aq
.fi
.if n \{\
.RE
@@ -1206,7 +1206,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,
@@ -1222,7 +1222,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
@@ -1237,7 +1237,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\&.
@@ -1372,10 +1372,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
@@ -1405,10 +1405,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
@@ -1428,7 +1428,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
@@ -1488,7 +1488,7 @@ is paired with
I B R
\e / /
\e / /
- `\-\-\-X\-\-\(aq
+ `\-\-\-X\-\-\*(Aq
.fi
.if n \{\
.RE
@@ -2119,7 +2119,7 @@ CommitDate: <committer\-date>
.\}
.sp
This format is used to refer to another commit in a commit message and is the same as
-\fB\-\-pretty=\(aqformat:%C(auto)%h (%s, %ad)\(aq\fR\&. By default, the date is formatted with
+\fB\-\-pretty=\*(Aqformat:%C(auto)%h (%s, %ad)\*(Aq\fR\&. By default, the date is formatted with
\fB\-\-date=short\fR
unless another
\fB\-\-date\fR
@@ -2911,12 +2911,12 @@ format works exactly like
.\}
.nf
$ git log \-2 \-\-pretty=format:%h 4da45bef \e
- | perl \-pe \(aq$_ \&.= " \-\- NO NEWLINE\en" unless /\en/\(aq
+ | perl \-pe \*(Aq$_ \&.= " \-\- NO NEWLINE\en" unless /\en/\*(Aq
4da45be
7134973 \-\- NO NEWLINE
$ git log \-2 \-\-pretty=tformat:%h 4da45bef \e
- | perl \-pe \(aq$_ \&.= " \-\- NO NEWLINE\en" unless /\en/\(aq
+ | perl \-pe \*(Aq$_ \&.= " \-\- NO NEWLINE\en" unless /\en/\*(Aq
4da45be
7134973
.fi
@@ -3048,7 +3048,7 @@ Output to a specific file instead of stdout\&.
Specify the character used to indicate new, old or context lines in the generated patch\&. Normally they are
\fI+\fR,
\fI\-\fR
-and \(aq \(aq respectively\&.
+and \*(Aq \*(Aq respectively\&.
.RE
.PP
\-\-raw
@@ -4305,7 +4305,7 @@ Shows all commits that are in local master but not in any remote repository mast
Shows the history including change diffs, but only from the \(lqmain branch\(rq perspective, skipping commits that come from merged branches, and showing full diffs of changes introduced by the merges\&. This makes sense only when following a strict policy of merging all topic branches when staying on a single integration branch\&.
.RE
.PP
-\fBgit log \-L \(aq/int main/\(aq,/^}/:main\&.c\fR
+\fBgit log \-L \*(Aq/int main/\*(Aq,/^}/:main\&.c\fR
.RS 4
Shows how the function
\fBmain()\fR
@@ -4479,7 +4479,7 @@ log\&.date
Set the default date\-time mode for the
\fIlog\fR
command\&. Setting a value for log\&.date is similar to using
-\fIgit log\fR\(aqs
+\fIgit log\fR\*(Aqs
\fB\-\-date\fR
option\&. See
\fBgit-log\fR(1)
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-29 01:35:52 +0000