From 65e62a883bdb5ab2ec71adc4e78b068e38568726 Mon Sep 17 00:00:00 2001 From: Cliff Rowley Date: Tue, 2 Jul 2013 16:00:54 +0100 Subject: [PATCH] Add git difftool (default alias "gdt") --- git.scmbrc.example | 1 + lib/git/aliases.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/git.scmbrc.example b/git.scmbrc.example index f279438..a620b9f 100644 --- a/git.scmbrc.example +++ b/git.scmbrc.example @@ -49,6 +49,7 @@ git_blame_alias="gbl" git_diff_alias="gd" git_diff_word_alias="gdw" git_diff_cached_alias="gdc" +git_difftool_alias="gdt" # 3. Standard commands git_clone_alias="gcl" git_fetch_alias="gf" diff --git a/lib/git/aliases.sh b/lib/git/aliases.sh index cfa4171..3c025ff 100644 --- a/lib/git/aliases.sh +++ b/lib/git/aliases.sh @@ -97,6 +97,7 @@ if [ "$git_setup_aliases" = "yes" ]; then __git_alias "$git_diff_word_alias" "git" "diff" "--word-diff" __git_alias "$git_diff_cached_alias" "git" "diff" "--cached" __git_alias "$git_add_patch_alias" "git" "add" "-p" + __git_alias "$git_difftool_alias" "git" "difftool" # 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_alias "$git_log_alias" "git" "$git_log_command"