Skip to content

Instantly share code, notes, and snippets.

@tricker

tricker/gist:4612319

Created January 23, 2013 19:59
Show Gist options
  • Save tricker/4612319 to your computer and use it in GitHub Desktop.
Save tricker/4612319 to your computer and use it in GitHub Desktop.
Download ZIP

Revisions

  1. tricker created this gist Jan 23, 2013.
    30 changes: 30 additions & 0 deletions gistfile1.txt
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,30 @@
    [color]
    ui = auto
    [user]
    name = Todd
    email = [email protected]
    [alias]
    br = branch
    ci = commit
    co = checkout
    st = status
    up = !git fetch && git rebase origin/master
    gpush = !git push origin HEAD:refs/for/master
    who = shortlog -s --
    logs = log --pretty=oneline
    spull = !git-svn rebase
    spush = !git-svn dcommit
    [color]
    ui = auto
    branch = auto
    diff = auto
    status = auto
    [core]
    excludesfile = /Users/Todd/.gitignore_global
    editor = vim
    [difftool "sourcetree"]
    cmd = opendiff \"$LOCAL\" \"$REMOTE\"
    path =
    [mergetool "sourcetree"]
    cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
    trustExitCode = true