4 #email = ian@iankelling.org
6 # Always use the git lg alias instead of git log. It's too easy to get
7 # confused by not seeing branches in git log output.
8 lg = log --graph --decorate
12 lol = log --graph --decorate --pretty=oneline --abbrev-commit --all
16 excludesfile = ~/.gitignore_global
20 # new option, but not available yet on debian wheezy
24 # based on ghc advice,
25 # https://ghc.haskell.org/trac/ghc/wiki/Building/GettingTheSources
27 ignoreSubmodules = dirty
29 # on git pull of coreboot:
30 # warning: inexact rename detection was skipped due to too many files.
31 # warning: you may want to set your diff.renameLimit variable to at least 3694 and retry the command.
44 # for hooks. http://stackoverflow.com/questions/2293498/git-commit-hooks-global-settings
46 templatedir = ~/.git_template
51 # This seemed like a good idea, but it broke interactive rebase, so disabled.
52 # for format-patch, use --base=auto. This means we need to do
53 # git branch --set-upstream-to, but that should be done automatically
54 # based on other settings.
57 # Disabled as this was to be used with useAutoBase, which didn't work as expected.
58 # sets local branches to have the same remote tracking branch.
59 # This allows the useAutoBase setting to work without having to
60 # setup the branch specially with
61 # git branch --set-upstream-to origin/my_branch
62 # or git checkout -b my-branch origin/whatever
63 # autoSetupMerge = always
65 # git pull always does rebase by default
66 autoSetupRebase = always