Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add git difftool (default alias "gdt") #95

Merged
merged 1 commit into from Jul 16, 2013
Merged

Add git difftool (default alias "gdt") #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions git.scmbrc.example
View file
Open in desktop
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions lib/git/aliases.sh
View file
Open in desktop
Expand Up @@ -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"
Expand Down