diff options
author | Junio C Hamano <gitster@pobox.com> | 2023-10-23 14:45:54 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-10-23 14:45:54 -0700 |
commit | 33be82183d4cd6dc645f64da1402cf9a3f4cdbf3 (patch) | |
tree | 4a681cad5c6da23a7d7f56022666fb31397026d2 /git-branch.html | |
parent | 359f02427091f2c0fcac4eb7651fe5d159b84a54 (diff) | |
download | git-htmldocs-33be82183d4cd6dc645f64da1402cf9a3f4cdbf3.tar.gz |
Autogenerated HTML docs for v2.42.0-482-g2e8e7
Diffstat (limited to 'git-branch.html')
-rw-r--r-- | git-branch.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-branch.html b/git-branch.html index 76182852b..f70785499 100644 --- a/git-branch.html +++ b/git-branch.html @@ -1358,7 +1358,7 @@ branch.<name>.remote <dd>
<p>
When on branch <name>, it tells <em>git fetch</em> and <em>git push</em>
- which remote to fetch from/push to. The remote to push to
+ which remote to fetch from or push to. The remote to push to
may be overridden with <code>remote.pushDefault</code> (for all branches).
The remote to push to, for the current branch, may be further
overridden by <code>branch.<name>.pushRemote</code>. If no remote is
@@ -1396,7 +1396,7 @@ branch.<name>.merge 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 <em>git pull</em> (which at first calls
+ The merge information is used by <em>git pull</em> (which first calls
<em>git fetch</em>) to lookup the default branch for merging. Without
this option, <em>git pull</em> defaults to merge the first refspec fetched.
Specify multiple values to get an octopus merge.
@@ -1443,7 +1443,7 @@ branch.<name>.description <p>
Branch description, can be edited with
<code>git branch --edit-description</code>. Branch description is
- automatically added in the format-patch cover letter or
+ automatically added to the format-patch cover letter or
request-pull summary.
</p>
</dd>
|