diff options
Diffstat (limited to 'man1/git-show-branch.1')
| -rw-r--r-- | man1/git-show-branch.1 | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/man1/git-show-branch.1 b/man1/git-show-branch.1 index 414a50502..990b1131a 100644 --- a/man1/git-show-branch.1 +++ b/man1/git-show-branch.1 @@ -2,12 +2,12 @@ .\" Title: git-show-branch .\" 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\-SHOW\-BRANCH" "1" "03/21/2023" "Git 2\&.40\&.0\&.130\&.g27d43a" "Git Manual" +.TH "GIT\-SHOW\-BRANCH" "1" "03/28/2023" "Git 2\&.40\&.0\&.141\&.g8d9035" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -168,7 +168,7 @@ The following example shows three branches, "master", "fixes" and "mhf": .\} .nf $ git show\-branch master fixes mhf -* [master] Add \(aqgit show\-branch\(aq\&. +* [master] Add \*(Aqgit show\-branch\*(Aq\&. ! [fixes] Introduce "reset type" flag to "git reset" ! [mhf] Allow "+remote:local" refspec to cause \-\-force when fetching\&. \-\-\- @@ -178,18 +178,18 @@ $ git show\-branch master fixes mhf + [mhf~2] "git fetch \-\-force"\&. + [mhf~3] Use \&.git/remote/origin, not \&.git/branches/origin\&. + [mhf~4] Make "git pull" and "git fetch" default to origin - + [mhf~5] Infamous \(aqoctopus merge\(aq + + [mhf~5] Infamous \*(Aqoctopus merge\*(Aq + [mhf~6] Retire git\-parse\-remote\&. + [mhf~7] Multi\-head fetch\&. + [mhf~8] Start adding the $GIT_DIR/remotes/ support\&. -*++ [master] Add \(aqgit show\-branch\(aq\&. +*++ [master] Add \*(Aqgit show\-branch\*(Aq\&. .fi .if n \{\ .RE .\} .sp .sp -These three branches all forked from a common commit, [master], whose commit message is "Add \(aqgit show\-branch\(aq"\&. The "fixes" branch adds one commit "Introduce "reset type" flag to "git reset""\&. The "mhf" branch adds many other commits\&. The current branch is "master"\&. +These three branches all forked from a common commit, [master], whose commit message is "Add \*(Aqgit show\-branch\*(Aq"\&. The "fixes" branch adds one commit "Introduce "reset type" flag to "git reset""\&. The "mhf" branch adds many other commits\&. The current branch is "master"\&. .SH "EXAMPLES" .sp If you keep your primary branches immediately under \fBrefs/heads\fR, and topic branches in subdirectories of it, having the following in the configuration file may help: |