diff options
Diffstat (limited to 'man7/gitglossary.7')
| -rw-r--r-- | man7/gitglossary.7 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/man7/gitglossary.7 b/man7/gitglossary.7 index 83b798471..812acbda5 100644 --- a/man7/gitglossary.7 +++ b/man7/gitglossary.7 @@ -2,12 +2,12 @@ .\" Title: gitglossary .\" 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 "GITGLOSSARY" "7" "03/21/2023" "Git 2\&.40\&.0\&.130\&.g27d43a" "Git Manual" +.TH "GITGLOSSARY" "7" "03/28/2023" "Git 2\&.40\&.0\&.141\&.g8d9035" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -269,7 +269,7 @@ merge where you have a revision and you are "merging" another -branch\(aqs changes that happen to be a descendant of what you have\&. In such a case, you do not make a new +branch\*(Aqs changes that happen to be a descendant of what you have\&. In such a case, you do not make a new merge commit but instead just update your branch to point at the same revision as the branch you are merging\&. This will happen frequently on a @@ -1061,7 +1061,7 @@ object that can be recursively dereferenced to a tree object\&. Dereferencing a commit object yields the tree object corresponding to the -revision\(aqs top +revision\*(Aqs top directory\&. The following are all tree\-ishes: a commit\-ish, a tree object, a tag object |