-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
executable file
·105 lines (83 loc) · 1.95 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
91
92
93
94
95
96
97
98
99
100
101
102
103
104
[user]
name = Jonathan Hartley
email = [email protected]
[alias]
# See 'g*' functions in .bashrc
[init]
defaultBranch = main
[gui]
warndetachedcommit = true
fontui = -family Ubuntu -size 9 -weight normal -slant roman -underline 0 -overstrike 0
gcwarning = false
diffcontext = 1
fontdiff = -family \"DejaVu Sans Mono\" -size 8 -weight normal -slant roman -underline 0 -overstrike 0
[color]
branch = auto
diff = auto
interactive = auto
status = auto
ui = true
[color "branch"]
current = bold cyan
local = green
[color "decorate"]
HEAD = bold cyan
branch = green
remoteBranch = red
tag = 226 # bright yellow
stash = bold magenta
[color "diff"]
meta = reverse bold cyan
frag = bold
new = green
plain = white
whitespace = reverse
[color "status"]
untracked = dim white
added = green
changed = 226 # bright yellow
branch = green
deleted = red
[core]
pager = less -FRS
trustctime = false
attributesfile = /home/jhartley/.gitattributes
# Recommented by @glyph. TBH I don't understand why.
[protocol "http"]
allow = never
[protocol "git"]
allow = never
[fetch]
fsckObjects = true
[transfer]
fsckObjects = true
[receive]
fsckObjects = true
[push]
default = current
autoSetupRemote = true
[pull]
ff = only
[log]
decorate = short
[diff]
tool = meld
[difftool]
prompt = false
[difftool "meld"]
cmd = meld "$LOCAL" "$REMOTE"
[merge]
tool = meld
[mergetool]
prompt = false
[mergetool "meld"]
# Choose one of these 2 lines, not both:
# Middle pane starts with git's attempt to merge.
cmd = meld "$LOCAL" "$MERGED" "$REMOTE" --output "$MERGED"
# Middle pane starts with the common ancestor.
# cmd = meld "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED"
[gitreview]
remote = origin
username = Jonathan.Hartley
[url "git+ssh://[email protected]/"]
insteadof = lp: