fixes and some improvements
[distro-setup] / .gitconfig
1 [user]
2 name = Ian Kelling
3 email = iank@fsf.org
4 #email = ian@iankelling.org
5 [alias]
6 lg = log --graph
7 lgstat = log --stat --graph --pretty=format:'%h %ad- %s [%an]'
8 co = checkout
9 s = status
10 ci = commit
11 lol = log --graph --pretty=oneline --abbrev-commit --all
12 dt = difftool
13 # https://stackoverflow.com/questions/17369254/is-there-a-way-to-cause-git-reflog-to-show-a-date-alongside-each-entry
14 rl = reflog --format='%C(auto)%h %<|(17)%gd %C(blue)%ci%C(reset) %s'
15
16 [core]
17 excludesfile = ~/.gitignore_global
18 [credential]
19 helper = cache
20
21 # new option, but not available yet on debian wheezy
22 # [push]
23 # default = simple
24
25 # based on ghc advice,
26 # https://ghc.haskell.org/trac/ghc/wiki/Building/GettingTheSources
27 [diff]
28 ignoreSubmodules = dirty
29 tool = meld
30 # on git pull of coreboot:
31 # warning: inexact rename detection was skipped due to too many files.
32 # warning: you may want to set your diff.renameLimit variable to at least 3694 and retry the command.
33 renameLimit = 50000
34 renames = copy
35
36 [gitreview]
37 username = iank
38 remote = origin
39 [color]
40 ui = auto
41 status = auto
42 branch = auto
43 interactive = auto
44 diff = auto
45 # for hooks. http://stackoverflow.com/questions/2293498/git-commit-hooks-global-settings
46 [init]
47 templatedir = ~/.git_template
48 [difftool]
49 tool = meld
50 prompt = false
51 [format]
52 # This seemed like a good idea, but it broke interactive rebase, so disabled.
53 # for format-patch, use --base=auto. This means we need to do
54 # git branch --set-upstream-to, but that should be done automatically
55 # based on other settings.
56 # useAutoBase = true
57 [branch]
58 # Disabled as this was to be used with useAutoBase, which didn't work as expected.
59 # sets local branches to have the same remote tracking branch.
60 # This allows the useAutoBase setting to work without having to
61 # setup the branch specially with
62 # git branch --set-upstream-to origin/my_branch
63 # or git checkout -b my-branch origin/whatever
64 # autoSetupMerge = always
65
66 # make git pull always rebase by default
67 autoSetupRebase = always
68 [push]
69 default = simple
70
71 # this is because on sending email, i got this prompt:
72 # The Cc list above has been expanded by additional
73 # addresses found in the patch commit message. By default
74 # send-email prompts before sending whenever this occurs.
75 # This behavior is controlled by the sendemail.confirm
76 # configuration setting.
77
78 # For additional information, run 'git send-email --help'.
79 # To retain the current behavior, but squelch this message,
80 # run 'git config --global sendemail.confirm auto'.
81
82 # Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): y
83 [sendemail]
84 confirm = auto