-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy path.gitconfig
More file actions
108 lines (107 loc) · 2.17 KB
/
.gitconfig
File metadata and controls
108 lines (107 loc) · 2.17 KB
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
107
[user]
name = Simen Berge
email = bergesimen@gmail.com
signingkey = ~/.ssh/id_rsa.pub
[filter "lfs"]
smudge = git-lfs smudge -- %f
required = true
clean = git-lfs clean -- %f
process = git-lfs filter-process
[core]
editor = nvim
ignoreCase = false
excludesfile = ~/.gitignore_global
[worktree]
path = ..
[branch]
sort = -committerdate
[tag]
sort = version:refname
[alias]
l = "!. ~/.dotfiles/git/.githelpers && pretty_git_log"
aa = add .
aA = add -A
co = checkout
br = branch
ci = commit
c = commit
ca = commit -a
caa = commit -a --amend
df = diff
lg = log -p --pretty=fuller --abbrev-commit
lgg = log --pretty=fuller --abbrev-commit --stat
up = pull --rebase
st = status
s = status
p = push --follow-tags
pu = pull
r = reset
squash = "!f(){ git reset --soft HEAD~${1} && git commit --edit -m\"$(git log --format=%B --reverse HEAD..HEAD@{1})\"; };f"
fpl = push --force-with-lease
save = !git add -A && git commit -m 'chore: savepoint'
unsave = !git reset --soft HEAD~1
wl = worktree list
wa = worktree add
wr = worktree remove
d = icdiff
[color]
ui = auto
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
[color "status"]
added = yellow
changed = green
untracked = cyan
[color "diff-highlight"]
oldNormal = red bold
oldHighlight = red bold 52
newNormal = green bold
newHighlight = green bold 22
[column]
ui = auto
[fetch]
prune = true
pruneTags = true
all = true
# [url "ssh://git@github.com/"]
# insteadOf = https://github.com/
[include]
path = /Users/sib/.gitconfig.local
[dotfiles]
managed = true
[hub]
protocol = ssh
[diff]
algorithm = histogram
colorMoved = plain
mnemonicPrefix = true
renames = true
[init]
defaultBranch = main
[push]
default = simple
autoSetupRemote = true
followTags = true
[pull]
rebase = true
[commit]
verbose = true
gpgsign = true
[gpg]
format = ssh
[merge]
tool = "nvimdiff"
conflictstyle = zdiff3
[mergetool "nvimdiff"]
layout = "LOCAL,BASE,REMOTE / MERGED"
[help]
autocorrect = prompt
[includeIf "gitdir:~/Developer/code/work/cybr/"]
path = ~/Developer/code/work/cybr/.gitconfig