-
Notifications
You must be signed in to change notification settings - Fork 1
/
Copy pathgitconfig
executable file
·120 lines (117 loc) · 3.33 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
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
[user]
name = Jesper Kjeldgaard
email = jk@clearhaus.com
signingkey = BA522F691E026E45
[github]
user = thejspr
[commit]
gpgsign = true
[color]
ui = true
[push]
default = tracking
autoSetupRemote = true
[core]
excludesfile = ~/.gitignore
whitespace = trailing-space,space-before-tab
ignorecase = false
attributesfile = /Users/jesper/dotfiles/gitattributes
pager = diff-so-fancy | less --tabs=4 -RFX
[alias]
a = add --all
aa = add -A
ac = !git add . && git commit -am
amend = commit -a --amend
amendf = commit -a --amend --no-edit
b = branch
bclean = !git co master && git branch --merged | grep -v master | grep -v staging | xargs -r git branch -d
c = commit -v
ca = !git add -A && git commit -v
co = checkout
ci = ci-status -v
d = diff
dc = diff --cached
ds = diff --stat
edit = !git status -sb | tail +2 | grep -v '^ D' | awk '{print $2}' | xargs -o $EDITOR
gc = gc --prune=now
l = log --oneline --decorate -16
ll = log --pretty=format:'%Cred%h%Creset %s %Cgreen(%cr) %C(black)<%an>%Creset' \
--abbrev-commit \
--date=relative -16
ms = checkout master
mt = mergetool
pc = !FORCE=1 git push -u origin $(git symbolic-ref --short HEAD)
r = remote
rc = !git add -A && git rebase --continue
rh = reset --hard
wip = !git add --all && git commit -m 'WIP'
undo = reset HEAD~1 --mixed
stg = checkout staging
browse = !gh browse-branch
cl = !git co master && git pull && git remote prune origin && git bclean
rcl = !git co master && git pull && bundle && migrate && git remote prune origin && git bclean
bip = for-each-ref --sort='authordate:iso8601' --format=' %(color:green)%(authordate:relative)%09%(color:yellow)%(refname:short)' refs/heads
rinse = !git submodule foreach --recursive git clean -xfd && git submodule sync --recursive && git restore . --recurse-submodules
[apply]
whitespace = nowarn
[branch]
autosetupmerge = true
[advice]
pushNonFastForward = false
statusHints = false
[gc]
auto = 1
[mergetool]
prompt = false
keepBackup = false
[diff]
renames = copies
mnemonicprefix = true
algorithm = patience
tool = nvimdiff
; [difftool "nvimdiff"]
; cmd = nvim -d \"$LOCAL\" \"$REMOTE\" -c \"wincmd w\" -c \"wincmd L\"
; [difftool]
; prompt = false
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
required = true
process = git-lfs filter-process
[merge]
tool = nvimmerge
[mergetool "nvimmerge"]
cmd = nvim -d \"$LOCAL\" \"$MERGED\" \"$BASE\" \"$REMOTE\" -c \"wincmd w\" -c \"wincmd J\"
[pull]
ff = only
[interactive]
diffFilter = diff-so-fancy --patch
[color "diff-highlight"]
oldNormal = red bold
oldHighlight = red bold 52
newNormal = green bold
newHighlight = green bold 22
[color "diff"]
meta = 11
frag = magenta bold
func = 146 bold
commit = yellow bold
old = red bold
new = green bold
whitespace = red reverse
[init]
defaultBranch = master
[credential "https://github.com"]
helper =
helper = !/usr/bin/gh auth git-credential
[credential "https://gist.github.com"]
helper =
helper = !/usr/bin/gh auth git-credential
[difftool]
prompt = false
[difftool "p4merge"]
path = /home/jesper/apps/p4/bin/p4merge
[mergetool "p4merge"]
path = /home/jesper/apps/p4/bin/p4merge
[mergetool]
keepBackup = false