Addd gmnff gmff alias for git merge --no-ff and --ff

2013-09-18 15:56:32 +02:00
parent e8c79f955c
commit 91b48718d1
2 changed files with 4 additions and 0 deletions
--- a/git.scmbrc.example
+++ b/git.scmbrc.example
@@ -81,6 +81,8 @@ git_rebase_alias_continue="grbc"
 git_rebase_alias_abort="grba"
 git_reset_last_commit="grsl"
 git_merge_alias="gm"
+git_merge_no_fast_forward_alias="gmnff"
+git_merge_only_fast_forward_alias="gmff"
 git_cherry_pick_alias="gcp"
 git_log_alias="gl"
 git_log_stat_alias="gls"