-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathgitconfig
97 lines (91 loc) · 2.07 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
[user]
name = Eryn Wells
email = [email protected]
[core]
editor = nvim
quotepath = false
excludesfile = ~/.gitignore
[color]
ui = auto
[alias]
amend = commit --amend --no-edit
edit = commit --amend --only
# Commits
c = commit
cm = commit -m
ca = commit -a
cam = commit -am
# Amended commits
ce = commit --amend --only
cn = commit --amend
cna = commit --amend -a
cnam = commit --amend -am
# Status, diffs
s = status
l = log
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
d = diff
dc = diff --cached
dt = difftool
mine = log --author='Eryn Wells'
# Branches, etc
b = branch
co = checkout
cob = checkout -b
# Merges and rebases
m = merge
ma = merge --abort
mt = mergetool
rb = rebase
rbi = rebase --interactive
rbc = rebase --continue
rba = rebase --abort
rbs = rebase --skip
rbm = rebase origin/master master
# Resets, moving HEAD
r = reset
r1 = reset HEAD^
r2 = reset HEAD^^
rh = reset --hard
rh1 = reset --hard HEAD^
rh2 = reset --hard HEAD^^
# Remotes
p = push -u
pf = push -uf
f = fetch
sup = submodule update --recursive
really-clean = clean -fd
rs = restore --stage
sc = switch --create
[ui]
color = true
[diff]
tool = KS
algorithm = histogram
[difftool]
prompt = false
[difftool "KS"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[merge]
tool = KS
[mergetool]
keepBackup = true
prompt = false
[mergetool "KS"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true
[push]
default = simple
[rebase]
autoStash = true
[sendemail]
transferEncoding = base64
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[pull]
rebase = true
[init]
defaultBranch = main