Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Git merge aliases #110

Merged
merged 1 commit into from

2 participants

@tuxinaut

Use gmnff and gmff aliases for not fast forward (--no-ff) and only fast forward (-ff)

I think this make merging a litte superiorly

@tuxinaut

Not interested in these aliases?

@ndbroadbent
Owner

OK, these look good, thanks

@ndbroadbent ndbroadbent merged commit 9432e8c into from
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Sep 19, 2013
  1. Addd gmnff gmff alias for git merge --no-ff and --ff

    Denny Schäfer authored
This page is out of date. Refresh to see the latest.
Showing with 4 additions and 0 deletions.
  1. +2 −0  git.scmbrc.example
  2. +2 −0  lib/git/aliases.sh
View
2  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"
View
2  lib/git/aliases.sh
@@ -121,6 +121,8 @@ if [ "$git_setup_aliases" = "yes" ]; then
__git_alias "$git_rebase_alias_abort" "git" 'rebase' "--abort"
__git_alias "$git_reset_last_commit" "git" "reset HEAD~"
__git_alias "$git_merge_alias" "git" 'merge'
+ __git_alias "$git_merge_no_fast_forward_alias" "git" "merge" "--no-ff"
+ __git_alias "$git_merge_only_fast_forward_alias" "git" "merge" "--ff"
__git_alias "$git_cherry_pick_alias" "git" 'cherry-pick'
__git_alias "$git_show_alias" "git" 'show'
__git_alias "$git_show_summary" "git" 'show' '--summary'
Something went wrong with that request. Please try again.