diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2016-01-21 01:55:37 -0500 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2016-01-21 01:55:37 -0500 |
| commit | fdc511572823f64ef3c1bffe25bd3a88787d5d6a (patch) | |
| tree | 8d9436094382539e6027b37c9636bd03b79871d9 /lisp/km-magit.el | |
| parent | 0a5b1ede4373649e110b136aa50a4c4fdf37368b (diff) | |
| download | emacs.d-fdc511572823f64ef3c1bffe25bd3a88787d5d6a.tar.gz | |
Replace obsolete magit-get-tracked-branch
Diffstat (limited to 'lisp/km-magit.el')
| -rw-r--r-- | lisp/km-magit.el | 2 |
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"))) |