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