summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/km-magit.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/km-magit.el b/lisp/km-magit.el
index 1dba7bd..6c4ed39 100644
--- a/lisp/km-magit.el
+++ b/lisp/km-magit.el
@@ -88,7 +88,7 @@ branch."
"Perform fast-forward merge of upstream branch.
\n(git merge --no-edit --ff-only <upstream>)"
(interactive)
- (--if-let (magit-get-tracked-branch)
+ (--if-let (magit-get-upstream-branch)
(magit-merge it '("--ff-only"))
(user-error "No upstream branch")))