-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathgitconfig
113 lines (112 loc) · 3.25 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
[user]
name = Felipe Espinoza
email = [email protected]
signkey = 59F53B57
[color]
ui = auto
[alias]
conf = !vim ~/.gitconfig
gconf = "!git conf | grep"
aa = add --all
back = checkout -
br = branch
brd = branch -d
brm = branch --merged
ca = commit --amend --verbose
ci = commit --verbose
co = checkout
cob = checkout -b
ctags = !.git/hooks/ctags
dc = diff --word-diff --cached --color-words
delete-branch = !sh -c 'git push origin :refs/heads/$1 && git branch -D $1' -
df = diff --word-diff --color-words
dflog = log --format='- %s%n%w(80,2,2)%b'
glog = log -E -i --grep
l = "!source ~/.githelpers && pretty_git_log"
la = !git l --all
main = checkout main
mg = merge --no-ff
prm = git pr
r = !git l -30
ra = !git r --all
ri = rebase -i
ric = rebase --continue
rmdeleted = !git rm $(git ls-files --deleted)
rpo = remote prune origin
sla = log --oneline --decorate --graph --all
sma = submodule add
smu = submodule update
st = status -sb
std = status
unchange = checkout --
uncommit = reset --soft HEAD^
unstage = reset
wdiff = diff HEAD^ --word-diff
week = !source ~/.githelpers && last_week_log
mt = mergetool
logdiff = log --format='- %s%n%n%w(80,2,2)%b'
rb = rebase
rbc = rebase --continue
brdd = branch -D
wip = !git commit -a -m 'WIP [ci skip]'
cdbrm = clean-development-branches
cl = changelog-from-parent
nr = not-released
o = open-in-github
what = what-changed-in-branch
bcd = branch-changes-diff
bcl = branch-changes-log
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
# If you want to set up Kaleidoscope as the default diff tool,
# then also set the following variables:
[difftool]
prompt = false
[diff]
tool = Kaleidoscope
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" \"$REMOTE\"
# If you want to set up Kaleidoscope as the default merge tool,
# then also set the following variables:
[mergetool]
prompt = false
[merge]
tool = Kaleidoscope
[credential]
helper = osxkeychain
[core]
excludesfile = ~/.gitignore_global
editor = nvim
[fetch]
prune = true
[push]
default = current
tags = true
autoSetupRemote = true
[pull]
tags = true
[filter "media"]
required = true
clean = git media clean %f
smudge = git media smudge %f
[commit]
template = ~/.gitmessage
[filter "hawser"]
clean = git hawser clean %f
smudge = git hawser smudge %f
required = true
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[github]
user = fespinoza
[pull]
rebase = false
[diff "localizablestrings"]
; textconv = "iconv -f utf-16 -t utf-8"
; textconv = "iconv -t utf-8"
; binary = false
[init]
defaultBranch = main