-
Notifications
You must be signed in to change notification settings - Fork 1
Expand file tree
/
Copy pathgitconfig
More file actions
107 lines (105 loc) · 3.2 KB
/
gitconfig
File metadata and controls
107 lines (105 loc) · 3.2 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
[alias]
a = add
aa = add --all
an = add --all -N
ap = add --patch
st = -c color.status=false status
ci = commit
ciamend = commit --amend -n
cp = cherry-pick
br = branch
co = checkout
me = merge --no-ff
ms = merge --squash
d = diff
ds = diff --stat
dt = difftool
dtc = difftool --cached
dtn = difftool --name-only
dts = difftool --stat
di = diff
din = diff --name-only
dic = diff --cached
dis = diff --stat
lc = log -1 --format=%cd
lo = log --oneline --reverse -100
lod = log --pretty=format:'%C(yellow)%h %C(red)%ad %C(yellow)%d %Creset%s' --date=format:'%F %T' --reverse -100
lomine = !git log --oneline --reverse -100 --committer=\"$(git config user.name)\"
lomd = !git log --oneline --reverse -100 $(git main-branch)..HEAD
lomds = !git log --oneline --reverse -100 $(git main-branch)..HEAD --stat
lomdn = !git log --oneline --reverse -100 $(git main-branch)..HEAD --name-only
dth = difftool HEAD
dtsh = diff --stat HEAD
lg = log --oneline --graph --all
ld = log --oneline --reverse HEAD ^develop --no-merges
lm = !git log --oneline --reverse HEAD ^$(git main-branch) --no-merges
re = rebase -i
rec = rebase --continue
mt = mergetool
rstaged = restore --staged
root = !pwd
main-branch = !git symbolic-ref refs/remotes/origin/HEAD | cut -d'/' -f4
remotesh = remote set-head origin --auto
backup = archive --format=tar --output=backup.tar.gz HEAD
gone = !git branch -vv | rg gone | awk '{ print $1 }'
gonedelete = !git gone | xargs git br -D
[include]
path = ~/.gitconfig.local
[core]
editor = nvim
pager = less -R
trustctime = false
excludesfile = ~/.git_global_ignore
quotepath = false
[diff]
tool = nvimdiff
algorithm = histogram
submodule = log
[difftool "nvimdiff"]
cmd = "nvim -d \"$LOCAL\" \"$REMOTE\""
[merge]
tool = fugitive
conflictstyle = zdiff3
[status]
submoduleSummary = true
[color]
ui = auto
[grep]
lineNumber = true
[difftool]
prompt = false
[mergetool]
prompt = false
[mergetool "fugitive"]
cmd = nvim -f -c \"Gvdiff\" \"$MERGED\"
[push]
default = current
[pull]
default = current
[rerere]
enabled = true
[branch]
autosetuprebase = always
sort = -committerdate
[init]
templatedir = ~/.git-templates
[includeIf "gitdir:~/workspace/1990/"]
path = ~/workspace/1990/.gitconfig
[commit]
gpgsign = true
[gpg]
format = ssh
[gpg "ssh"]
allowedSignersFile = ~/.ssh/allowedSignersFile
# To override SSH key (for example in the includeIf config above), use:
# [core]
# sshCommand = ssh -i ~/.ssh/some_key -F /dev/null
# To enable signing with SSH key:
# https://code.mendhak.com/keepassxc-sign-git-commit-with-ssh/
#
# [commit]
# gpgsign = true
# [gpg]
# format = ssh
# [user]
# signingkey = "key::ssh-ed25519 ...public key"