Skip to content

Instantly share code, notes, and snippets.

@bjhess
Created December 19, 2011 01:04
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 bjhess/1494995 to your computer and use it in GitHub Desktop.
Save bjhess/1494995 to your computer and use it in GitHub Desktop.
git diff'n
# side by side diff
alias gside="git difftool -t opendiff"
# resolve merge conflicts with filemerge
alias gmergetool="git mergetool -t opendiff"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment