From 3dacf2aea618685331f22ffcc8661605546828d4 Mon Sep 17 00:00:00 2001 From: Robert Boone Date: Mon, 25 Oct 2010 10:19:14 -0500 Subject: [PATCH] Add switch for fast-forward only merge: --ff-only --- magit-key-mode.el | 1 + 1 file changed, 1 insertion(+) diff --git a/magit-key-mode.el b/magit-key-mode.el index f772cdc0..607b5452 100644 --- 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"))