flo/scm_breeze
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #110 from tuxinaut/master

Browse Source 
Git merge aliases
This commit is contained in:
Nathan Broadbent
2013-10-22 22:14:31 -07:00
parent e2d98bc7c5 91b48718d1
commit 9432e8c907
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
git.scmbrc.example
View File

@@ -81,6 +81,8 @@ git_rebase_alias_continue="grbc"
git_rebase_alias_abort="grba" git_rebase_alias_abort="grba"
git_reset_last_commit="grsl" git_reset_last_commit="grsl"
git_merge_alias="gm" git_merge_alias="gm"
git_merge_no_fast_forward_alias="gmnff"
git_merge_only_fast_forward_alias="gmff"
git_cherry_pick_alias="gcp" git_cherry_pick_alias="gcp"
git_log_alias="gl" git_log_alias="gl"
git_log_stat_alias="gls" git_log_stat_alias="gls"

2
lib/git/aliases.sh
View File

@@ -121,6 +121,8 @@ if [ "$git_setup_aliases" = "yes" ]; then
__git_alias "$git_rebase_alias_abort" "git" 'rebase' "--abort" __git_alias "$git_rebase_alias_abort" "git" 'rebase' "--abort"
__git_alias "$git_reset_last_commit" "git" "reset HEAD~" __git_alias "$git_reset_last_commit" "git" "reset HEAD~"
__git_alias "$git_merge_alias" "git" 'merge' __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_cherry_pick_alias" "git" 'cherry-pick'
__git_alias "$git_show_alias" "git" 'show' __git_alias "$git_show_alias" "git" 'show'
__git_alias "$git_show_summary" "git" 'show' '--summary' __git_alias "$git_show_summary" "git" 'show' '--summary'