-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
90 lines (72 loc) · 2.42 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
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
# This is Git's per-user configuration file.
# fix whitespace errors
[apply]
whitespace = fix
[core]
# always exclude files in ~/.gitignore
excludesfile = ~/.gitignore
# mark these things as whitespace errors
whitespace = space-before-tab,-indent-with-non-tab,trailing-space
# don't trust computer's time (safer on MacOS)
trustctime = false
# cache untracked to make commands faster
untrackedCache = true
# set diff-so-fancy as the pager
[pager]
diff = "diff-so-fancy | less --tabs=4 -RFX"
show = "diff-so-fancy | less --tabs=4 -RFX"
# diff-so-fancy settings
[diff-so-fancy]
stripLeadingSymbols = false
# use colored git outputs where capable
[color]
ui = auto
# better colors for diff-so-fancy
[color "diff-highlight"]
oldNormal = "red bold"
oldHighlight = "red bold 52"
newNormal = "green bold"
newHighlight = "green bold 22"
[color "diff"]
meta = "11"
frag = "magenta bold"
commit = "yellow bold"
old = "red bold"
new = "green bold"
whitespace = "red reverse"
newMoved = "cyan"
oldMoved = "blue"
[color "branch"]
current = "yellow reverse"
local = "yellow"
remote = "green"
[color "status"]
added = "yellow"
changed = "green"
untracked = "cyan"
# add git-together config
[include]
path = ~/.git-together
# the user whose credentials will go into all commits
[user]
name = Marc Miller
email = [email protected]
# Detect copies as well as renames
[diff]
renames = copies
# Set intellij as the default merge tool in MacOS (uncomment to use)
# [merge]
# tool = intellij
# [difftool "intellij"]
# cmd = /Applications/IntelliJ\\ IDEA.app/Contents/MacOS/idea diff $(cd $(dirname \"$LOCAL\") && pwd)/$(basename \"$LOCAL\") $(cd $(dirname \"$REMOTE\") && pwd)/$(basename \"$REMOTE\")
# [mergetool "intellij"]
# cmd = /Applications/IntelliJ\\ IDEA.app/Contents/MacOS/idea merge $(cd $(dirname \"$LOCAL\") && pwd)/$(basename \"$LOCAL\") $(cd $(dirname \"$REMOTE\") && pwd)/$(basename \"$REMOTE\") $(cd $(dirname \"$BASE\") && pwd)/$(basename \"$BASE\") $(cd $(dirname \"$MERGED\") && pwd)/$(basename \"$MERGED\")
# trustExitCode = true
# allow 'gis.io:' vs '[email protected]:' for SSH to Geoint Services
[url "[email protected]"]
insteadOf = "gis.io:"
[git-together]
active = mm
[git-together "user"]
name = Marc Miller
email = [email protected]