-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
52 lines (52 loc) · 1.4 KB
/
.gitconfig
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
[user]
name = Colin P. Schimmelfing
email = colinschimmelfing@gmail.com
[alias]
co = checkout
st = status -sb
ci = commit
cp = cherry-pick
br = branch
desc = describe
sh = show
df = diff
p = add -p
ri = rebase -i
mkmodule = !sh -c 'git checkout master && git checkout -b "modules/$0" && git rm -rf * && git update-ref -d `git rev-parse --symbolic-full-name HEAD` && mkdir -p manifests && touch manifests/init.pp && git add manifests/init.pp && git commit -m \"initial commit - branch modules/$0\" && git push origin modules/$0'
[color]
diff = auto
branch = auto
status = auto
whitespace = red reverse
ui = 1
[color "branch"]
remote = yellow
local = cyan
current = green
[color "diff"]
commit = bold
meta = red
frag = magenta
old = yellow
new = cyan
whitespace = red reverse
[color "status"]
header = cyan
added = green
changed = yellow
[core]
excludesfile = /Users/cschimmelfing/.gitignore
[apply]
# choices are <nowarn|warn|fix|error|error-all>
whitespace = fix
[push]
default = matching
[merge]
# Using {{git merge-tool}} during a conflict will open this program with each set of conflicting files.
# I like to use meld, a graphical diff viewer and merge tool
# Other options include sdiff, vimdiff, etc.
tool = meld[user]
[mergetool]
keepBackup = true
[help]
autocorrect = 20