Skip to content

Instantly share code, notes, and snippets.

@nbomberger
Last active December 22, 2015 13:19
Show Gist options
  • Save nbomberger/6478672 to your computer and use it in GitHub Desktop.
Save nbomberger/6478672 to your computer and use it in GitHub Desktop.
Git config file to add colors and shortcuts.
[user]
name = <your name>
email = <email address>
logallrefupdates=true
[core]
excludesfile = /Users/nbomberger/.gitignore_global
[credential]
helper = osxkeychain
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[diff]
tool = Kaleidoscope
[difftool]
prompt = false
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true
[mergetool]
prompt = false
keepBackup = true
[merge]
tool = Kaleidoscope
[color]
ui = auto
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "status"]
added = yellow
changed = green
untracked = cyan
[alias]
st = status
ci = commit
br = branch
co = checkout
df = diff
lg = log -p
lol = log --graph --decorate --pretty=oneline --abbrev-commit
lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
ls = ls-files
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment