-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathgitconfig
More file actions
110 lines (109 loc) · 2.81 KB
/
Copy pathgitconfig
File metadata and controls
110 lines (109 loc) · 2.81 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
108
109
110
# vi: ft=gitconfig
[include]
path = ~/.gituserconfig
[advice]
skippedCherryPicks = false
statusHints = false
forceDeleteBranch = false
[alias]
ap = add --patch
arm = "!f() { \
branch=$(git default-branch); \
git absorb --and-rebase --base \"$branch\"; \
}; f"
br = branch
ci = commit
cia = ci --amend
cian = cia --no-edit
cm = !git co $(git default-branch)
co = checkout
dca = diff --cached
default-branch = !git show-ref --verify --quiet refs/heads/main \
&& echo main || echo master
fixup = "!f() { \
commit=$(git log -n 30 --pretty=format:'%h %s' --no-merges \
| fzf \
| cut -c -7); \
git commit --fixup \"$commit\"; \
GIT_SEQUENCE_EDITOR=true git rebase -i --autosquash \"$commit\"~1; \
}; f"
fpu = push --force-with-lease --force-if-includes
fpus = fpu --push-option=ci.skip
glog = log --pretty=format:\"%h %s\" --graph
rb = rebase
rbc = rb --continue
rbm = "!f() { \
branch=$(git default-branch); git rb \"$branch\"; \
}; f"
rbim = "!f() { \
branch=$(git default-branch); git rb -i \"$branch\"; \
}; f"
rbcn = !(GIT_EDITOR=true git rbc)
rbs = rb --skip
slog = log --stat
st = status
unpushed = log @{u}.. --pretty=format:'%h %an %s'
drop-stash-pop-conflicts = "\
!git diff --name-only -z --diff-filter=U | \
xargs -0 -r git restore --source=HEAD --staged --worktree --"
[checkout]
ignoreSubmodules = dirty
[color]
ui = true
[commit]
gpgsign = true
verbose = true
[core]
excludesfile = ~/.gitignore
whitespace = trailing-space,space-before-tab,cr-at-eol
pager = delta
[credential]
helper = cache --timeout=86400
[diff]
ignoreSubmodules = dirty
tool = vimdiff
[fetch]
parallel = 0
prune = true
[filter "lfs"]
clean = git-lfs clean -- %f
process = git-lfs filter-process
required = true
smudge = git-lfs smudge -- %f
[init]
defaultBranch = main
templateDir = ~/.git-template
[log]
abbrevCommit = true
follow = true
[merge]
tool = vimdiff
conflictStyle = zdiff3
[pull]
rebase = true
prune = true
tags = true
[push]
default = simple
followTags = true
signed = true
[rebase]
autosquash = true
autostash = true
[status]
submoduleSummary = true
[submodule]
recurse = true
[tag]
gpgSign = true
[user]
name = Joris Clement
useConfigOnly = true
[rerere]
enabled = true
[includeIf "hasconfig:remote.*.url:git@github.com:*/**"]
path = ~/.github_userconfig
[interactive]
diffFilter = delta --color-only
[delta]
navigate = true