branch: elpa/git-commit
commit f766f68f78b982443850b2e4433d83e26971fdb0
Author: Brennan Vincent <bren...@umanwizard.com>
Commit: Jonas Bernoulli <jo...@bernoul.li>
magit-pull: Add --ff-only
---
lisp/magit-pull.el | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lisp/magit-pull.el b/lisp/magit-pull.el
index 333cb3e..479431c 100644
--- a/lisp/magit-pull.el
+++ b/lisp/magit-pull.el
@@ -45,8 +45,10 @@
(transient-define-prefix magit-pull ()
"Pull from another repository."
:man-page "git-pull"
+ :incompatible '(("--ff-only" "--rebase"))
[:description
(lambda () (if magit-pull-or-fetch "Pull arguments" "Arguments"))
+ ("-f" "Fast-forward only" "--ff-only")
("-r" "Rebase local commits" ("-r" "--rebase"))
("-A" "Autostash" "--autostash" :level 7)]
[:description
