fix mistake from recent commit
[distro-setup] / .gitconfig
1 [user]
2 name = Ian Kelling
3 email = iank@fsf.org
4 #email = ian@iankelling.org
5 [alias]
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
9 co = checkout
10 s = status
11 ci = commit
12 lol = log --graph --decorate --pretty=oneline --abbrev-commit --all
13 dt = difftool
14
15 [core]
16 excludesfile = ~/.gitignore_global
17 [credential]
18 helper = cache
19
20 # new option, but not available yet on debian wheezy
21 # [push]
22 # default = simple
23
24 # based on ghc advice,
25 # https://ghc.haskell.org/trac/ghc/wiki/Building/GettingTheSources
26 [diff]
27 ignoreSubmodules = dirty
28 tool = meld
29 # gitinspector complained
30 renamelimit = 5000
31
32 [gitreview]
33 username = iank
34 remote = origin
35 [color]
36 ui = auto
37 status = auto
38 branch = auto
39 interactive = auto
40 diff = auto
41 # for hooks. http://stackoverflow.com/questions/2293498/git-commit-hooks-global-settings
42 [init]
43 templatedir = ~/.git_template
44 [difftool]
45 tool = meld
46 prompt = false
47 [format]
48 # This seemed like a good idea, but it broke interactive rebase, so disabled.
49 # for format-patch, use --base=auto. This means we need to do
50 # git branch --set-upstream-to, but that should be done automatically
51 # based on other settings.
52 # useAutoBase = true
53 [branch]
54 # Disabled as this was to be used with useAutoBase, which didn't work as expected.
55 # sets local branches to have the same remote tracking branch.
56 # This allows the useAutoBase setting to work without having to
57 # setup the branch specially with
58 # git branch --set-upstream-to origin/my_branch
59 # or git checkout -b my-branch origin/whatever
60 # autoSetupMerge = always
61
62 # git pull always does rebase by default
63 autoSetupRebase = always
64 [push]
65 default = simple