various improvements
[distro-setup] / .gitconfig
1 [user]
2 name = Ian Kelling
3 email = ian@iankelling.org
4 [alias]
5 co = checkout
6 s = status
7 ci = commit
8 lol = log --graph --decorate --pretty=oneline --abbrev-commit --all
9 [core]
10 excludesfile = /home/ian/.gitignore_global
11 [github]
12 user = ian-kelling
13 token = d2dc0c5c6fef5378cc896a617e53c1a9
14 [credential]
15 helper = cache
16
17 # new option, but not available yet on debian wheezy
18 # [push]
19 # default = simple
20
21 # based on ghc advice,
22 # https://ghc.haskell.org/trac/ghc/wiki/Building/GettingTheSources
23 [diff]
24 ignoreSubmodules = dirty
25 tool = meld
26
27 [gitreview]
28 username = iank
29 remote = origin
30 # this is for newer git version. Doesn't work for ubuntu 12.04's version
31 #[push]
32 # default = simple
33 [color]
34 ui = auto
35 status = auto
36 branch = auto
37 interactive = auto
38 diff = auto
39 # for hooks. http://stackoverflow.com/questions/2293498/git-commit-hooks-global-settings
40 [init]
41 templatedir = ~/.git_template
42 [difftool]
43 tool = meld
44 prompt = false
45 [format]
46 # for format-patch, use --base=auto. This means we need to do
47 # git branch --set-upstream-to
48 useAutoBase = true
49 [branch]
50 # sets local branches to have the same remote tracking branch.
51 # This allows the useAutoBase setting to work without having to
52 # setup the branch specially with
53 # git branch --set-upstream-to origin/my_branch
54 # or git checkout -b my-branch origin/whatever
55 autoSetupMerge = always
56 # git pull always does rebase by default
57 autoSetupRebase = always