Skip to content

Instantly share code, notes, and snippets.

@acrookston
Created January 17, 2016 04:22
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 acrookston/f189d268408b4ab14959 to your computer and use it in GitHub Desktop.
Save acrookston/f189d268408b4ab14959 to your computer and use it in GitHub Desktop.
rendered gitconfig from acrookston/dotfiles
[core]
excludesfile = /Users/!!!INSERT YOUR COMPUTER USERNAME!!!/.gitignore
[push]
default = current
[color]
ui = true
[user]
name = !!!INSERT YOUR NAME!!!
email = !!!INSERT YOUR EMAIL!!!
[github]
user = !!!INSERT YOUR GITHUB USERNAME!!!
[gist]
private = yes
[color "branch"]
current = bold green
local = green
remote = blue
[merge]
conflictstyle = diff3
tool = fugitive
[merge "fugitive"]
cmd = mvim -f -c \"Gdiff\" \"$MERGED\"
[rebase]
autosquash = true
stat = true
[init]
templatedir = ~/.git_template
[alias]
unadd = reset HEAD
a = add
aa = add --all
ap = add --patch
amend = commit --amend
fix = commit --amend -C HEAD
s = status
w = whatchanged
d = diff
dc = diff --cached
ds = diff --stat
dom = diff origin/master
b = branch
l = log
g = log --all --decorate --graph --pretty=format:'%C(yellow)%h %C(red)%ad %C(blue)%an%C(green)%d %C(reset)%s' --date=short --abbrev-commit
lo = log --pretty=format:'%C(yellow)%h %C(red)%ad %C(blue)%an%C(green)%d %C(reset)%s' --date=short
go = log --pretty=format:'%C(yellow)%h %C(red)%ad %C(blue)%an%C(green)%d %C(reset)%s' --date=short -i origin/master --grep
lb = log --format=oneline origin/master
lg = log --grep
lf = log -i --format=oneline origin/master --grep
ll = log -p
c = commit
co = checkout
pr = pull --rebase
r = rebase
rom = rebase origin/master
rn = revert --no-commit
sp = stash pop
sl = stash list
hist = "log --pretty=format:\\\"%h %ad | %s%d [%an]\\\" --graph --date=short new = !sh -c 'git log $1@{1}..$1@{0} \\\"$@\\\"' prune = !git remote | xargs -n 1 git remote prune "
graph = "log --all --decorate --graph --pretty=oneline --abbrev-commit"
list = "log --all --decorate --graph --abbrev-commit --pretty=format:'%C(yellow)%h %C(red)%ad %C(blue)%an%C(green)%d %C(reset)%s' --date=short"
new = !sh -c 'git log $1@{1}..$1@{0} \"$@\"'
prune = !git remote | xargs -n 1 git remote prune
[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
[filter "lfs"]
clean = git-lfs clean %f
smudge = git-lfs smudge %f
required = true
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment