-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
91 lines (91 loc) · 2.79 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
91
[alias]
a = "!f(){ git diff --name-only $@ | fzf -m --print0 --ansi --preview \"git diff --color=always -- {-1}\" | xargs -0 git add; };f"
bt = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset%n' --abbrev-commit --date=relative --branches
c = commit
ca = commit --amend
cae = commit --amend --no-edit
ch = "!f(){ git branch --sort=-committerdate | fzf --height=20 | xargs git checkout; };f"
d = "!f(){ git diff --name-only $@ | fzf -m --ansi --preview \"git diff --color=always -- {-1}\"; };f"
fixup = "!f(){ git log --color=always --reverse --pretty=tformat:'%Cred%h%Creset - %s %Cgreen(%an %ar)%Creset' origin/master.. | fzf --ansi | cut -d"-" -f1 | xargs git commit --fixup; };f"
gen = "!f(){ git commit --message=\"$(git show-branch --no-name HEAD | sed -E 's/^[a-z]{1,5}/gen/')\"; };f"
l = log --graph --pretty=tformat:'%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%an %ar)%Creset'
merged-branches = "!git branch --merged master"
p = push
pl = push --force-with-lease
r = rebase origin/master
radd = "!f(){ git add $(git diff --cached --name-only --diff-filter=ACMRTU); };f"
ri = rebase --autosquash --interactive origin/master
ru = remote update
sru = "!f(){ git remote update && git stash && git rebase origin/${1:-master} && git stash pop; };f"
sri = "!f(){ git remote update && git stash && git rebase --interactive origin/${1:-master} && git stash pop; };f"
s = "!f(){ gitui; };f"
st = status
unstage = reset HEAD --
uncommit = reset HEAD~
[color]
ui = true
[color "branch"]
upstream = cyan
[color "diff"]
meta = yellow
frag = magenta bold
commit = yellow bold
old = red bold
new = green bold
whitespace = red reverse
[color "diff-highlight"]
oldNormal = red bold
oldHighlight = red bold 52
newNormal = green bold
newHighlight = green bold 22
[commit]
verbose = true
[core]
whitespace = -trailing-space
editor = nvim
excludesfile = ~/.gitignore_global
[credential]
helper = cache --timeout=86400
[diff]
algorithm = histogram
colorMoved = plain
colormovedws = allow-indentation-change
# external = "difft"
mnemonicPrefix = true
renames = true
submodule = log
wordRegex = .
[fetch]
recurseSubmodules = on-demand
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[grep]
extendedRegexp = true
[log]
abbrevCommit = true
[merge]
conflictStyle = zdiff3
[mergetool]
keepBackup = false
keepTemporaries = false
prompt = false
[protocol]
version = 2
[pull]
rebase = true
[push]
default = current
[rebase]
autosquash = true
autostash = true
[status]
submoduleSummary = true
showUntrackedFiles = all
[tag]
sort = version:refname
[user]
name = "Jérôme Pin"
email = jeromepin@users.noreply.github.com