summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2014-11-16 11:30:24 -0500
committerKyle Meyer <kyle@kyleam.com>2014-11-16 11:30:24 -0500
commitd3f73d56e9e57c6d51946e237a6c07d3ba4c5a34 (patch)
tree34ba2ce4188fb100dc28c18297c04773d7d426d3 /lisp
parent18339d46597d0c6d5a949f55f8a2c3235d61bb32 (diff)
downloademacs.d-d3f73d56e9e57c6d51946e237a6c07d3ba4c5a34.tar.gz
Update magit-log-all-branches for upstream changes
Magit commit 893e2fea941335f1f428c2e1f996e42822b0fe59
Diffstat (limited to 'lisp')
-rw-r--r--lisp/init-git.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/init-git.el b/lisp/init-git.el
index 5da58a6..0a033d4 100644
--- a/lisp/init-git.el
+++ b/lisp/init-git.el
@@ -76,10 +76,10 @@ requiring confirmation.
(let ((remote (magit-read-remote "Remote")))
(magit-run-git-async "push" "-v" remote "--all")))
-(defun km/magit-log-all-branches (range &optional args)
+(defun km/magit-log-all-branches (range &optional args files)
(interactive (magit-log-read-args t))
(add-to-list 'args "--all")
- (magit-log range args))
+ (magit-log range args files))
(defun km/magit-checkout-local-tracking (remote-branch)
"Create and checkout a local tracking branch for REMOTE-BRANCH.