Merge remote branch 'refs/remotes/rlb3/master'

2010-10-27 10:56:56 +01:00 · 2010-10-27 10:56:56 +01:00 · 6404261327
commit 6404261327
parent bdccbb7c74 3dacf2aea6
1 changed files with 1 additions and 0 deletions
--- a/magit-key-mode.el
+++ b/magit-key-mode.el
@ -99,6 +99,7 @@
     (actions
      ("m" "Merge" magit-merge))
     (switches
+      ("-ff" "Fast-forward only" "--ff-only")
      ("-nf" "No fast-forward" "--no-ff")
      ("-nc" "No commit" "--no-commit")
      ("-sq" "Squash" "--squash"))