-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy path.gitconfig
67 lines (59 loc) · 1.84 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
[user]
email = [email protected]
name = Tooster
signingKey = ~/.ssh/id_rsa.pub
[alias]
dog = log --decorate --oneline --graph
adog = dog --all
dog2 = log --graph --pretty=format:'%C(auto)%<|(16)%h%Creset %C(dim green)%>|(18)%cr%Creset\t - %C(dim)%s %C(italic yellow)<%an>%Creset %C(auto)%d%Creset' --abbrev-commit
adog2 = dog2 --all
dog3 = log --all --graph --pretty=format:'%C(auto)%<|(20)%h%Creset %C(bold cyan)%cd%Creset %C(dim green)(%cr)%Creset %>|(74)%C(magenta)%G?%C(dim italic yellow) ~%cn%Creset %C(auto)%d%Creset %>|(80)%m %C(dim)%s' --abbrev-commit --date=format-local:'%d-%m-%Y %a %H:%M'
adog3 = dog3 --all
branch-name = "!git rev-parse --abbrev-ref HEAD"
seppuku = "!f(){ BNAME=$(git branch-name); git reset --hard origin/${BNAME}; }; f;"
publish = "!git push -u origin $(git branch-name)"
fixup="commit --amend --no-edit"
reword="commit --amend -m"
show-tracked="ls-tree -r master --name-only"
pull-all="pull --recurse-submodules"
[merge]
tool = vscode
[mergetool "vscode"]
cmd = code --wait --merge $REMOTE $LOCAL $BASE $MERGED
[mergetool "unity"]
trustExitCode = false
cmd = ~/Unity/Hub/Editor/2022.3.13f1/Editor/Data/Tools/UnityYAMLMerge merge -p "$BASE" "$REMOTE" "$LOCAL" "$MERGED"
[mergetool "meld"]
trustExitCode = false
cmd = meld "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED"
[diff]
tool = difftastic
external = difft
[difftool]
prompt = false
[difftool "vscode"]
cmd = code --wait --diff $LOCAL $REMOTE
[difftool "difftastic"]
cmd = difft "$LOCAL" "$REMOTE"
[pager]
difftool = true
[color]
ui = auto
[core]
editor = nvim
autocrlf = input
# pager = "less -iXFR"
[commit]
gpgsign = true
[tag]
gpgsign = true
[gpg]
format = ssh
[init]
defaultBranch = master
[gpg "ssh"]
allowedSignersFile = ~/.ssh/allowed_signers
[rerere]
enabled = true
[pull]
rebase = true