Skip to content

Instantly share code, notes, and snippets.

@nclark
Forked from Lytol/gist:280458
Created January 18, 2010 23:10
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save nclark/280478 to your computer and use it in GitHub Desktop.
Save nclark/280478 to your computer and use it in GitHub Desktop.
.gitconfig
[user]
email = <your-email>
name = <your-name>
[color]
diff = auto
status = auto
branch = auto
[alias]
st = status
co = checkout
ci = commit
br = branch
put = push origin HEAD
slog = log --pretty=format:'%h - %an, %ar : %s'
cp = cherry-pick
msg = commit --allow-empty -m
unstage = reset HEAD
[core]
excludesfile = <your-home-dir>/.gitignore
[github]
user = <your-github-username>
token = <your-github-token>
[merge]
tool = diffmerge
keepBackup = false
[mergetool "diffmerge"]
cmd = diffmerge --merge --result=$MERGED $LOCAL $BASE $REMOTE
trustExitCode = false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment