-
Notifications
You must be signed in to change notification settings - Fork 0
/
gitconfig
68 lines (68 loc) · 1.96 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
[core]
excludesfile = ~/.gitignore_global
[gui]
fontui = -family \"DejaVu Sans\" -size 8 -weight normal -slant roman -underline 0 -overstrike 0
fontdiff = -family \"DejaVu Sans Mono\" -size 7 -weight normal -slant roman -underline 0 -overstrike 0
[user]
email = [email protected]
name = Jorge Morante
;[color]
;ui = auto
;branch = auto
;diff = auto
;status = auto
;[color "branch"]
;current = yellow reverse
;local = yellow
;remote = green
;[color "diff"]
;meta = blue bold
;frag = magenta bold
;old = red bold
;new = green bold
[rerere]
enabled = true
[color "status"]
added = yellow
changed = green
untracked = cyan
[merge]
tool = manual
renamelimit = 4096
[mergetool "manual"]
cmd = vim $MERGED
keepTemporaries = false
prompt = false
[mergetool "theirs"]
cmd = git merge-file --theirs \"$CURRENT\" \"$BASE\" \"$OTHER\"
[mergetool "ours"]
cmd = git merge-file --ours \"$CURRENT\" \"$BASE\" \"$OTHER\"
[pull]
rebase = false
[push]
default = simple
[alias]
st = status
co = checkout
glog = log --graph
ch = "!f() { git commit --allow-empty -m \"* $1\"; }; f"
recent = !git for-each-ref --sort=-committerdate --format='%(refname:short)' refs/heads/ | grep -v develop | head -n 20
fixup = "!f() { git commit --fixup=$1; }; f"
autofixup = "!f() { git commit --fixup=$1; git rebase -i --autosquash $1~1; }; f"
amend = commit --amend --no-edit
nav = "!f() { git recent | fzf | xargs git co; }; f"
gh-clone = "!f() { git clone [email protected]:$1; }; f"
diffc = diff --cached
difft = "!f() { GIT_EXTERNAL_DIFF=difft git diff $1; }; f"
current-branch = symbolic-ref --short HEAD
whoosh = "!f() { git commit -am 'WIP'; git push; }; f"
wip = commit -am wip
yolo = commit --no-verify
tree = "!f() { git ls-files | tree --fromfile; }; f"
[github]
user = Morantron
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
required = true
process = git-lfs filter-process