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

Add alias & default shortcut for git mergetool

Browse Source 
Provides parity with the `gdt` alias for `git difftool`
This commit is contained in:
Jeff Byrnes
2014-10-08 14:53:26 -04:00
committed by Jeff Byrnes
parent d1723709f1
commit 8761a4758b
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
git.scmbrc.example
View File

@@ -53,6 +53,7 @@ git_diff_file_alias="gdf"
git_diff_word_alias="gdw" git_diff_word_alias="gdw"
git_diff_cached_alias="gdc" git_diff_cached_alias="gdc"
git_difftool_alias="gdt" git_difftool_alias="gdt"
git_mergetool_alias="gmt"
# 3. Standard commands # 3. Standard commands
git_clone_alias="gcl" git_clone_alias="gcl"
git_fetch_alias="gf" git_fetch_alias="gf"

1
lib/git/aliases.sh
View File

@@ -113,6 +113,7 @@ if [ "$git_setup_aliases" = "yes" ]; then
__git_alias "$git_add_patch_alias" 'git' 'add' '-p' __git_alias "$git_add_patch_alias" 'git' 'add' '-p'
__git_alias "$git_add_updated_alias" 'git' 'add' '-u' __git_alias "$git_add_updated_alias" 'git' 'add' '-u'
__git_alias "$git_difftool_alias" 'git' 'difftool' __git_alias "$git_difftool_alias" 'git' 'difftool'
__git_alias "$git_mergetool_alias" 'git' 'mergetool'
# Custom default format for git log # Custom default format for git log
git_log_command="log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit" git_log_command="log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit"