Skip to content

Instantly share code, notes, and snippets.

@eedeep
Created November 11, 2013 04:28
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save eedeep/7407869 to your computer and use it in GitHub Desktop.
Save eedeep/7407869 to your computer and use it in GitHub Desktop.
[user]
name = dan peade
email = dan.peade@gmail.com
[diff]
tool = xxdiff
[difftool "xxdiff"]
cmd = xxdiff \"\" \"\"
[difftool]
prompt = false
[merge]
tool = xxdiff
[color]
ui = true
[alias]
lg = log --abbrev-commit --pretty=format:'%C(yellow)%h%Creset%C(red)%d%Creset %s %C(blue)%an%Creset %Cgreen(%cr)%Creset' --graph --decorate
fb = "!f() { git branch -avv|grep $1; }; f"
mt = mergetool --tool=xxdiff
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment