Skip to content

Instantly share code, notes, and snippets.

@auchenberg
Last active August 29, 2015 13:57
Show Gist options
  • Select an option

  • Save auchenberg/9507541 to your computer and use it in GitHub Desktop.

Select an option

Save auchenberg/9507541 to your computer and use it in GitHub Desktop.
[alias]
st = status
ci = commit
br = branch
co = checkout
unstage = reset HEAD
uncommit = reset --soft HEAD^
# When doing "git git log" or some such, do not complain about "git" not
# being a valid Git command. This happens when copy-pasting examples, for
# instance.
git = !git
# Quickly view the latest commits in a multicolour oneliner format that
# highlights the parts I care about most: SHA, description and branch.
l = log --pretty=concise -n 20
# Like "git l", but show all and draw the history graph, too.
ll = log --pretty=concise --graph
# Show a concise status of the working directory, along with the branch
# and the number of commits behind and/or ahead.
s = status --short --branch
prep= rebase -i @{u}
[pretty]
concise = %C(yellow)%h%C(reset) %s %C(bold black)(%an, %ar)%C(reset)%C(bold blue)%d%C(reset)
[user]
name = Kenneth Auchenberg
email = kenneth@auchenberg.dk
[github]
user = auchenberg
[core]
excludesfile = /Users/auchenberg/.gitignore
[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
[branch "master"]
rebase = true
remote = origin
merge = refs/heads/master
[branch]
autosetuprebase = always
[mergetool]
keepBackup = false
[credential]
helper = osxkeychain
[color]
ui = auto
[push]
default = simple
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment