summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/km-magit.el10
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/km-magit.el b/lisp/km-magit.el
index 9603171..fcb3809 100644
--- a/lisp/km-magit.el
+++ b/lisp/km-magit.el
@@ -121,7 +121,7 @@ branch."
\n(git merge --no-edit --ff-only <upstream>)"
(interactive)
(--if-let (magit-get-upstream-branch)
- (magit-merge it '("--ff-only"))
+ (magit-merge-plain it '("--ff-only"))
(user-error "No upstream branch")))
;;;###autoload
@@ -556,8 +556,8 @@ argument. Interactively, this can be accessed using the command
(defun km/magit-log-current (&optional args files)
"Like `magit-log-current', but if head is detached, use \"HEAD\"."
(interactive (magit-log-arguments))
- (magit-log (list (or (magit-get-current-branch) "HEAD"))
- args files))
+ (magit-log-current (list (or (magit-get-current-branch) "HEAD"))
+ args files))
(defun km/magit-log-dwim (&optional args files)
(interactive (magit-log-arguments))
@@ -587,8 +587,8 @@ argument. Interactively, this can be accessed using the command
(and (magit-rev-verify (concat it "^2"))
(concat it "^-1"))))))
(if range
- (magit-log (list range) args files)
- (call-interactively #'magit-log))))
+ (magit-git-log (list range) args files)
+ (call-interactively #'magit-log-current))))
;;;###autoload
(defun km/magit-log-occurrence (beg end)