-
Notifications
You must be signed in to change notification settings - Fork 1
/
gitconfig
61 lines (48 loc) · 1.53 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
[user]
name = Arron Green
[credential]
helper = osxkeychain
useHttpPath = true
[core]
editor = vim
excludesfile = ~/.gitignore
[color]
ui = true
[alias]
lol = log --graph --decorate --pretty=oneline --abbrev-commit
lola = log --graph --decorate --pretty=format:\"%C(yellow)%h %C(white)%d%Creset %s %Cblue(%an) %Cred%cr\" --abbrev-commit --all
setuser-personal = !git config user.name 'Arron Green' && git config user.email '[email protected]' && git whoami
setuser-work = !git config user.name 'Arron Green' && git config user.email '[email protected]' && git whoami
whoami = !bash -c 'echo \"$(git config --get user.name) <$(git config --get user.email)>\"'
squash = "!f(){ git rebase -i $(git merge-base ${1:-master} $(git rev-parse --abbrev-ref HEAD)); };f"
rm-merged = !git branch --merged | egrep -v '(^\\*|master|dev)' | xargs -I{} git branch -d {}
root = !git rev-parse --show-toplevel
git = !exec git
[merge]
tool = diffmerge
[mergetool "diffmerge"]
cmd = diffmerge --merge\n--result=$MERGED $LOCAL $BASE $REMOTE
trustExitCode = true
[mergetool]
keepBackup = false
[diff]
tool = diffmerge
colorMoved = zebra
[difftool "diffmerge"]
cmd = diffmerge $LOCAL $REMOTE
[push]
default = simple
[grep]
extendRegexp = true
lineNumber = true
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[init]
defaultBranch = main
[fetch]
prune = true
[pull]
rebase = true