/
gitconfig
90 lines (85 loc) · 2.34 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
[color]
ui = auto
[user]
name = Julien Wajsberg
email = felash@gmail.com
signingkey = 0xBF7DCFA84F81D8C5
#fetch = +refs/pull/*/head:refs/remotes/origin/pr/*"
[rerere]
autoupdate = true
enabled = 1
[diff]
context = 8
colorMoved = default
tool=nvimdiff
interHunkContext = 16
colorMovedWS = allow-indentation-change
algorithm = histogram
[alias]
diffc = diff --cached
br = for-each-ref --sort=committerdate refs/heads/ --format='%(HEAD) %(color:yellow)%(refname:short)%(color:reset) - %(color:red)%(objectname:short)%(color:reset) - %(contents:subject) - %(authorname) (%(color:green)%(committerdate:relative)%(color:reset))'
del-phab = !git branch -l phab-D* --format='%(refname:short)' | xargs git branch -D
ca = commit --amend --no-edit
ff = merge --ff-only
pushn = push --no-verify
fixup = commit --fixup
squash = commit --squash
recommit = commit -C @{1}
tip = show -s
now = !git commit --amend --date=\"$(date)\" --no-edit
rc = rebase --continue
reword = commit --amend
list-files = diff-tree --no-commit-id --name-only -r HEAD
[interactive]
singlekey = true
# diffFilter = delta --color-only
[remote-hg]
hg-git-compat = true
[push]
default = simple
[rebase]
autoSquash = true
forkPoint = true
updateRefs = true
[help]
autocorrect = 1
[bz]
browser = firefox3
firefox-profile = default
[core]
excludesfile = /home/julien/.gitignore
untrackedCache = 1
# pager = delta
[cinnabar]
helper = /home/julien/.mozbuild/git-cinnabar/git-cinnabar-helper
version-check = 1711617469
[mozreview]
nickname = julienw
[absorb]
maxStack=50
[pull]
ff = only
[merge]
renamelimit = 2320
# set "nvim" as tool for merging
tool = nvim
conflictstyle=zdiff3
[mergetool]
# automatically launch merge tool without displaying a prompt
prompt = false
[mergetool "nvim"]
# define command which will be used when "nvim" is set as a merge tool
cmd = nvim -f -c \"Gdiffsplit!\" \"$MERGED\"
[init]
defaultBranch = main
[branch]
autoSetupRebase = always
autoSetupMerge = inherit
[delta]
features = zebra-dark
navigate = true # use n and N to move between diff sections
light = false # set to true if you're in a terminal w/ a light background color (e.g. the default macOS terminal)
minus-non-emph-style = syntax normal
plus-non-emph-style = syntax normal
[url "git@github.com:"]
pushInsteadOf = "https://github.com/"