gwh/slackbuilds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add switch for fast-forward only merge: --ff-only

Browse source
This commit is contained in:
Robert Boone 2010-10-25 10:19:14 -05:00
parent 7f8f7de527
commit 3dacf2aea6
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
magit-key-mode.el
View file

@ -99,6 +99,7 @@
(actions (actions
("m" "Merge" magit-merge)) ("m" "Merge" magit-merge))
(switches (switches
("-ff" "Fast-forward only" "--ff-only")
("-nf" "No fast-forward" "--no-ff") ("-nf" "No fast-forward" "--no-ff")
("-nc" "No commit" "--no-commit") ("-nc" "No commit" "--no-commit")
("-sq" "Squash" "--squash")) ("-sq" "Squash" "--squash"))