Skip to content

Instantly share code, notes, and snippets.

@johnlauck

johnlauck/.gitconfig

Created August 27, 2013 15:06
Show Gist options
  • Save johnlauck/6354787 to your computer and use it in GitHub Desktop.
Save johnlauck/6354787 to your computer and use it in GitHub Desktop.
Download ZIP

Revisions

  1. johnlauck created this gist Aug 27, 2013.
    50 changes: 50 additions & 0 deletions .gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,50 @@
    [color]
    diff = auto
    status = auto
    branch = auto
    interactive = auto
    ui = true
    pager = true

    [color "branch"]
    current = yellow reverse
    local = yellow
    remote = green

    [color "diff"]
    meta = yellow bold
    frag = magenta bold
    old = red bold
    new = green bold

    [color "status"]
    added = yellow
    changed = green
    untracked = cyan

    [core]
    pager = less -FRSX
    whitespace=fix,-indent-with-non-tab,trailing-space,cr-at-eol
    excludesfile = /Users/johnl/.gitignore
    [push]
    default = current
    [alias]
    st = status
    ci = commit
    co = checkout
    w = whatchanged
    lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
    sdiff = stash show -p stash@{$@}

    [diff]
    renamelimit = 0
    [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
    [mergetool]
    keepBackup = true
    [rerere]
    enabled = 1