co = checkout
s = status
ci = commit
+ lol = log --graph --decorate --pretty=oneline --abbrev-commit --all
[core]
excludesfile = /home/ian/.gitignore_global
[github]
[gitreview]
username = iank
+ remote = origin
# this is for newer git version. Doesn't work for ubuntu 12.04's version
#[push]
# default = simple
[color]
ui = auto
+ status = auto
+ branch = auto
+ interactive = auto
+ diff = auto
# for hooks. http://stackoverflow.com/questions/2293498/git-commit-hooks-global-settings
[init]
templatedir = ~/.git_template
[difftool]
tool = meld
prompt = false
+[format]
+# This seemed like a good idea, but it broke interactive rebase, so disabled.
+# for format-patch, use --base=auto. This means we need to do
+# git branch --set-upstream-to, but that should be done automatically
+# based on other settings.
+# useAutoBase = true
+[branch]
+# Disabled as this was to be used with useAutoBase, which didn't work as expected.
+# sets local branches to have the same remote tracking branch.
+# This allows the useAutoBase setting to work without having to
+# setup the branch specially with
+# git branch --set-upstream-to origin/my_branch
+# or git checkout -b my-branch origin/whatever
+# autoSetupMerge = always
+
+ # git pull always does rebase by default
+ autoSetupRebase = always