summaryrefslogtreecommitdiffstats
path: root/man1/git-branch.1
diff options
context:
space:
mode:
Diffstat (limited to 'man1/git-branch.1')
-rw-r--r--man1/git-branch.112
1 files changed, 6 insertions, 6 deletions
diff --git a/man1/git-branch.1 b/man1/git-branch.1
index 74e793d22..750bf6b08 100644
--- a/man1/git-branch.1
+++ b/man1/git-branch.1
@@ -2,12 +2,12 @@
.\" Title: git-branch
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\" Date: 2023-10-20
+.\" Date: 2023-10-23
.\" Manual: Git Manual
-.\" Source: Git 2.42.0.424.gceadf0f3cf
+.\" Source: Git 2.42.0.482.g2e8e77cbac
.\" Language: English
.\"
-.TH "GIT\-BRANCH" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual"
+.TH "GIT\-BRANCH" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -472,7 +472,7 @@ When on branch <name>, it tells
\fIgit fetch\fR
and
\fIgit push\fR
-which remote to fetch from/push to\&. The remote to push to may be overridden with
+which remote to fetch from or push to\&. The remote to push to may be overridden with
\fBremote\&.pushDefault\fR
(for all branches)\&. The remote to push to, for the current branch, may be further overridden by
\fBbranch\&.<name>\&.pushRemote\fR\&. If no remote is configured, or if you are not on any branch and there is more than one remote defined in the repository, it defaults to
@@ -506,7 +506,7 @@ which branch to merge and can also affect
\fIgit fetch\fR
the default refspec to be marked for merging in FETCH_HEAD\&. The value is handled like the remote part of a refspec, and must match a ref which is fetched from the remote given by "branch\&.<name>\&.remote"\&. The merge information is used by
\fIgit pull\fR
-(which at first calls
+(which first calls
\fIgit fetch\fR) to lookup the default branch for merging\&. Without this option,
\fIgit pull\fR
defaults to merge the first refspec fetched\&. Specify multiple values to get an octopus merge\&. If you wish to setup
@@ -552,7 +552,7 @@ for details)\&.
branch\&.<name>\&.description
.RS 4
Branch description, can be edited with
-\fBgit branch \-\-edit\-description\fR\&. Branch description is automatically added in the format\-patch cover letter or request\-pull summary\&.
+\fBgit branch \-\-edit\-description\fR\&. Branch description is automatically added to the format\-patch cover letter or request\-pull summary\&.
.RE
.SH "EXAMPLES"
.PP