Switch branches/tags
Nothing to show
Find file Copy path
Fetching contributors…
Cannot retrieve contributors at this time
45 lines (44 sloc) 1.35 KB
name = James Mead
email =
editor = vim
excludesfile = /Users/jamesmead/.gitignore
attributesFile = /Users/jamesmead/.gitattributes
ui = auto
st = status -sb
ci = commit -v
co = checkout
cp = cherry-pick
br = branch
rb = rebase
lg = "log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --"
# always rebase vs merge when pulling
autosetuprebase = always
# push the current branch back to the tracked/upstream branch
# but refuse to push if the upstream branch’s name is different from the local one
default = simple
# allow fixup & squash commits
autosquash = true
# rebase branches on top of the fetched branch
# locally committed merge commits will not be flattened by running `git pull`
rebase = preserve
# display diff in commit editor
verbose = true
[url "ssh://"]
# always use SSH for Heroku git repos
# see
insteadOf =
# in merge conflicts show original source as well as changes by both sides
conflictstyle = diff3
# when using `git status` & `git commit` show individual files in untracked directories
showUntrackedFiles = all