diff options
Diffstat (limited to 'man7/gitcore-tutorial.7')
| -rw-r--r-- | man7/gitcore-tutorial.7 | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/man7/gitcore-tutorial.7 b/man7/gitcore-tutorial.7 index 57df04e5c..330239391 100644 --- a/man7/gitcore-tutorial.7 +++ b/man7/gitcore-tutorial.7 @@ -2,12 +2,12 @@ .\" Title: gitcore-tutorial .\" 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 "GITCORE\-TUTORIAL" "7" "03/21/2023" "Git 2\&.40\&.0\&.130\&.g27d43a" "Git Manual" +.TH "GITCORE\-TUTORIAL" "7" "03/28/2023" "Git 2\&.40\&.0\&.141\&.g8d9035" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -345,7 +345,7 @@ In particular, let\(cqs not even check in the two files into Git yet, we\(cqll s .RS 4 .\} .nf -$ echo "It\(aqs a new day for git" >>hello +$ echo "It\*(Aqs a new day for git" >>hello .fi .if n \{\ .RE @@ -380,7 +380,7 @@ index 557db03\&.\&.263414f 100644 +++ b/hello @@ \-1 +1,2 @@ Hello World -+It\(aqs a new day for git ++It\*(Aqs a new day for git .fi .if n \{\ .RE @@ -404,7 +404,7 @@ index 557db03\&.\&.263414f 100644 +++ b/hello @@ \-1 +1,2 @@ Hello World -+It\(aqs a new day for git ++It\*(Aqs a new day for git .fi .if n \{\ .RE @@ -453,7 +453,7 @@ And this is where we create the \fB\&.git/refs/heads/master\fR file which is poi .\} .nf $ tree=$(git write\-tree) -$ commit=$(echo \(aqInitial commit\(aq | git commit\-tree $tree) +$ commit=$(echo \*(AqInitial commit\*(Aq | git commit\-tree $tree) $ git update\-ref HEAD $commit .fi .if n \{\ @@ -759,7 +759,7 @@ in the new repository to make sure that the index file is up to date\&. .sp Note that the second point is true even across machines\&. You can duplicate a remote Git repository with \fBany\fR regular copy mechanism, be it \fIscp\fR, \fIrsync\fR or \fIwget\fR\&. .sp -When copying a remote repository, you\(cqll want to at a minimum update the index cache when you do this, and especially with other peoples\(aq repositories you often want to make sure that the index cache is in some known state (you don\(cqt know \fBwhat\fR they\(cqve done and not yet checked in), so usually you\(cqll precede the \fIgit update\-index\fR with a +When copying a remote repository, you\(cqll want to at a minimum update the index cache when you do this, and especially with other peoples\*(Aq repositories you often want to make sure that the index cache is in some known state (you don\(cqt know \fBwhat\fR they\(cqve done and not yet checked in), so usually you\(cqll precede the \fIgit update\-index\fR with a .sp .if n \{\ .RS 4 @@ -1061,7 +1061,7 @@ Not to worry\&. It left the (trivial) conflict in \fBhello\fR in the same form y .\} .nf Hello World -It\(aqs a new day for git +It\*(Aqs a new day for git Play, play, play Work, work, work .fi @@ -2077,9 +2077,9 @@ $ git merge commit\-fix diff\-fix $ git show\-branch ! [commit\-fix] Fix commit message normalization\&. ! [diff\-fix] Fix rename detection\&. - * [master] Octopus merge of branches \(aqdiff\-fix\(aq and \(aqcommit\-fix\(aq + * [master] Octopus merge of branches \*(Aqdiff\-fix\*(Aq and \*(Aqcommit\-fix\*(Aq \-\-\- - \- [master] Octopus merge of branches \(aqdiff\-fix\(aq and \(aqcommit\-fix\(aq + \- [master] Octopus merge of branches \*(Aqdiff\-fix\*(Aq and \*(Aqcommit\-fix\*(Aq + * [commit\-fix] Fix commit message normalization\&. +* [diff\-fix] Fix rename detection\&. +* [diff\-fix~1] Better common substring algorithm\&. |