-
Notifications
You must be signed in to change notification settings - Fork 0
/
gitconfig
48 lines (35 loc) · 1.22 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
[credential]
helper = cache --timeout=36000
[alias]
lg1 = log --graph --abbrev-commit --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)'
lg = lg1 --branches --remotes
raph = !"git pull --rebase --autostash"
cop = !"git diff -p -R --no-color | grep -E \"^(diff|(old|new) mode)\" --color=never | git apply"
rmgone = !"git fetch -p && for branch in `git branch -vv | grep ': gone]' | awk '{print $1}'`; do git branch -D $branch; done"
ignore = update-index --assume-unchanged
hide = update-index --skip-worktree
unhide = update-index --no-skip-worktree
hidden = !"git ls-files -v . | grep ^S"
[merge]
conflictstyle = zdiff3
#tool = nvim
tool = vscode
# define command which will be used when "nvim" is set as a merge tool
[mergetool "nvim"]
cmd = MYVIMRC=\"$HOME/.vimrc\" nvim -u $HOME/.vimrc -f -c \"Gvdiffsplit!\" \"$MERGED\"
[mergetool "vscode"]
cmd = code --wait $MERGED
# automatically launch merge tool without displaying a prompt
[mergetool]
prompt = false
[diff]
wsErrorHighlight = all
[core]
autocrlf = false
editor = nvim
[init]
defaultBranch = main
[push]
autoSetupRemote = true
[rebase]
updateRefs = true