aboutsummaryrefslogtreecommitdiff
path: root/lisp/magit-pull.el
diff options
context:
space:
mode:
authorJonas Bernoulli <jonas@bernoul.li>2019-03-18 09:03:00 +0100
committerJonas Bernoulli <jonas@bernoul.li>2019-03-18 09:03:00 +0100
commitbc45dd04e99e4237d62e44132fb15f458f3baf2b (patch)
tree3fa23879848a4cae8ddfb14c3cdc925ea4e90f5f /lisp/magit-pull.el
parent1dc160b1ae75cd3581f659a8d5be6574e48c3d8f (diff)
magit-{fetch,pull}-from-upstream: Fix doc-strings
Diffstat (limited to 'lisp/magit-pull.el')
-rw-r--r--lisp/magit-pull.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/magit-pull.el b/lisp/magit-pull.el
index 7e1f4c8..ed32077 100644
--- a/lisp/magit-pull.el
+++ b/lisp/magit-pull.el
@@ -102,7 +102,7 @@ the push-remote can be changed before pulling from it."
"Pull from the upstream of the current branch.
When `magit-remote-set-if-missing' is non-nil and
-the push-remote is not configured, then read the upstream from
+the upstream is not configured, then read the upstream from
the user, set it, and then pull from it. With a prefix argument
the upstream can be changed before pulling from it."
:if 'magit--upstream-suffix-predicate