Skip to content

Instantly share code, notes, and snippets.

@wilfredjonathanjames
Created August 13, 2014 02:00
Show Gist options
  • Save wilfredjonathanjames/0a1fe2cd22a04c0be949 to your computer and use it in GitHub Desktop.
Save wilfredjonathanjames/0a1fe2cd22a04c0be949 to your computer and use it in GitHub Desktop.
My .gitconfig
## ~/.gitconfig
[user]
name = ##name##
email = ##email##
[color]
ui = true
branch = auto
diff = auto
status = auto
[format]
pretty = oneline
[core]
autocrl = input
excludesfile = ~/.gitignore
editor = "subl -n -w"
quotepath = false
[diff]
renames = copy
[rerere]
enabled = true
[alias]
l= "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit"
st="status -sb"
diff="diff --color-words"
# stash
ss = stash # stash changes
sl = stash list # list stashes
sa = stash apply # apply stash (restore changes)
sd = stash drop # drop stashes (destory changes)
g = grep --break --heading --line-number
[push]
default = matching
[mergetool]
keepBackup = true
[mergetool "sublime"]
cmd = subl -w $MERGED
trustExitCode = false
[merge]
tool = sublime
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment