Commit 583d2c17 authored by Kyle Meyer's avatar Kyle Meyer

fix up recent documentation updates

parent 16bff55d
......@@ -3172,11 +3172,11 @@ info:gitman#git-config. Also see [[info:gitman#git-branch]],
This option specifies whether remote upstreams are favored over
local upstreams when creating new branches.
When a new branch is created, Magit offer the branch, commit, or
stash as the default starting-point as the starting point of the
new branch. If there is no such thing at point, then it falls
back to offer the current branch as starting-point. The user may
then accept that default or pick something else.
When a new branch is created, Magit offers the branch, commit, or
stash as the default starting point of the new branch. If there is
no such thing at point, then it falls back to offer the current
branch as starting-point. The user may then accept that default or
pick something else.
If the chosen starting-point is a branch, then it may also be set
as the upstream of the new branch, depending on the value of the
......
......@@ -4358,11 +4358,11 @@ and I recommend you leave it at that.
This option specifies whether remote upstreams are favored over
local upstreams when creating new branches.
When a new branch is created, Magit offer the branch, commit, or
stash as the default starting-point as the starting point of the
new branch. If there is no such thing at point, then it falls
back to offer the current branch as starting-point. The user may
then accept that default or pick something else.
When a new branch is created, Magit offers the branch, commit, or
stash as the default starting point of the new branch. If there is
no such thing at point, then it falls back to offer the current
branch as starting-point. The user may then accept that default or
pick something else.
If the chosen starting-point is a branch, then it may also be set
as the upstream of the new branch, depending on the value of the
......
......@@ -241,7 +241,7 @@ removed on the respective remote."
This popup is intended as a replacement for the separate popups
`magit-pull-popup' and `magit-fetch-popup'. To use it, add this
to you init file:
to your init file:
(with-eval-after-load 'magit-remote
(define-key magit-mode-map \"f\" 'magit-pull-and-fetch-popup)
......
......@@ -214,11 +214,11 @@ the remote branch and then checking out the new local branch."
(defcustom magit-branch-prefer-remote-upstream nil
"Whether to favor remote upstreams when creating new branches.
When a new branch is created, Magit offer the branch, commit, or
stash as the default starting-point as the starting point of the
new branch. If there is no such thing at point, then it falls
back to offer the current branch as starting-point. The user may
then accept that default or pick something else.
When a new branch is created, Magit offers the branch, commit, or
stash as the default starting point of the new branch. If there
is no such thing at point, then it falls back to offer the
current branch as starting-point. The user may then accept that
default or pick something else.
If the chosen starting-point is a branch, then it may also be set
as the upstream of the new branch, depending on the value of the
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment