-
Notifications
You must be signed in to change notification settings - Fork 4
/
dot_gitconfig
106 lines (84 loc) · 2.31 KB
/
dot_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
105
106
[include]
path = "~/.gitlocal"
[core]
autocrlf = false
compression = 0
[color]
ui = true
[alias]
st = status -s
ci = commit
br = branch
co = checkout
df = diff
lg = log --graph --decorate --oneline dev HEAD -n 20
who = shortlog -s --
k = !gitk
cl = clean -d
changed = !git diff $(git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@') --name-only
cb = !clean-branches
p = push --set-upstream origin
pi = push internal
pp = push public
pf = push --force-with-lease origin
pfi = push --force-with-lease internal
pfp = push --force-with-lease public
pff = push --force origin
pffi = push --force internal
pffp = push --force public
pd = push --delete origin
pdi = push --delete internal
pdp = push --delete public
pl = pull origin
pli = pull internal
plu = pull upstream
f = fetch origin
fi = fetch internal
fp = fetch public
fiddle = config --global http.proxy 127.0.0.1:8888
unfiddle = config --global --unset
addall = add -A :/
outgoing = log @{u}..
out = log @{u}..
incoming = log ..@{u}
in = log ..@{u}
mine = !git branch -a | grep anurse
[push]
default = simple
[pull]
default = simple
rebase = true
[diff]
algorithm = patience
tool = vscode
[difftool "winmerge"]
cmd = "winmergeu" -u -e "$LOCAL" "$REMOTE"
[difftool "p4merge"]
cmd = "p4merge" "$LOCAL" "$REMOTE"
[difftool "vscode"]
cmd = "code --wait --diff $LOCAL $REMOTE"
[difftool "vsdiffmerge"]
cmd = '"%VSINSTALLDIR%Common7/IDE/vsdiffmerge.exe"' "$LOCAL" "$REMOTE" //t
keepbackup = false
trustexistcode = true
[mergetool "vsdiffmerge"]
cmd = '"%VSINSTALLDIR%Common7/IDE/vsdiffmerge.exe"' "$REMOTE" "$LOCAL" "$BASE" "$MERGED" //m
keepbackup = false
trustexistcode = true
[mergetool "p4merge"]
cmd = "p4merge" "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
[mergetool "winmerge"]
cmd = "winmergeu" -u -e -dl \"Local\" -dr \"Remote\" "$LOCAL" "$REMOTE" "$MERGED"
[http]
postBuffer = 1048576000
maxRequestBuffer = 100M
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[init]
defaultBranch = main
[user]
name = Ashley Stanton-Nurse
email = [email protected]