-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy path.gitconfig
88 lines (88 loc) · 1.97 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
[include]
path = ~/Dropbox/.custom/.gitconfig-sglavoie
[color]
branch = auto
diff = auto
grep = auto
interactive = auto
status = auto
ui = true
[alias]
a = add
br = branch
c = commit
ca = commit --amend
can = commit --amend --no-edit
ch = checkout
d = diff
difflast = diff --cached HEAD^
ds = diff --staged
l = log
last = l -1 HEAD
lg = l --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
ln = l --name-only
logda = l --oneline --decorate --graph --all
ls = l --stat
po = push origin
pof = push origin --force
pos = push --set-upstream origin main
rc = rebase --continue
ri = rebase -i
rl = reflog
s = status --short
sh = show
sl = shortlog
st = status
t = tag
undo = "!f() { git reset --hard $(git rev-parse --abbrev-ref HEAD)@{${1-1}}; }; f"
unstage = reset HEAD --
vdiff = difftool --tool=
hs = log --pretty='%C(yellow)%h %C(cyan)%ad %Cblue%aN%C(auto)%d %Creset%s' --date=relative --date-order --graph
[core]
; editor = code --wait
editor = nvim
excludesfile = ~/.gitignore
pager = diff-so-fancy | less --tabs=4 -RFX
[commit]
gpgsign = true
template = ~/.gitmessage
[mergetool "nvim"]
cmd = nvim $MERGED
; [difftool "nvim"]
; cmd = nvim --diff $LOCAL $REMOTE
; [mergetool "vscode"]
; cmd = code --wait $MERGED
[difftool "vscode"]
cmd = code --wait --diff $LOCAL $REMOTE
[mergetool]
prompt = false
[color "diff-highlight"]
oldNormal = red bold
oldHighlight = red bold 52
newNormal = green bold
newHighlight = green bold 22
[color "diff"]
commit = yellow bold
frag = magenta bold
meta = 11
new = green bold
old = red bold
whitespace = red reverse
[push]
recurseSubmodules = on-demand
[gpg]
program = gpg
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge --skip -- %f
process = git-lfs filter-process --skip
required = true
[pull]
rebase = false
[credential]
helper = store
[init]
defaultBranch = main
templateDir = ~/.git-templates
[diff]
tool = vscode