Skip to content

Instantly share code, notes, and snippets.

@mudphone
Created January 24, 2013 23:06
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 1 You must be signed in to fork a gist
  • Save mudphone/4629260 to your computer and use it in GitHub Desktop.
Save mudphone/4629260 to your computer and use it in GitHub Desktop.
A simple .gitconfig file.
[user]
name = <# YOUR NAME #>
email = <# YOUR EMAIL #>
[alias]
co = checkout
st = status
ci = commit
br = branch
sm = submodule
smu = submodule update
smi = submodule init
smf = submodule foreach
lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
lgpo = log --pretty=oneline
[apply]
whitespace = nowarn
[color]
diff = auto
status = auto
branch = auto
interactive = auto
ui = auto
grep = auto
[help]
autocorrect = 1
[push]
default = current
[core]
editor = emacs
excludesfile = /Users/<# YOUR USER #>/.gitignore
quotepath = false
[branch "master"]
remote = origin
merge = refs/heads/master
[branch "development"]
merge = refs/heads/development
remote = origin
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true
[credential]
helper = osxkeychain
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment