-
Notifications
You must be signed in to change notification settings - Fork 21
/
.gitconfig
48 lines (48 loc) · 1.27 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
[push]
default = upstream
[color]
diff = auto
status = auto
branch = auto
[alias]
parent = "!git show-branch | grep '*' | grep -v \"$(git rev-parse --abbrev-ref HEAD)\" | head -n1 | sed 's/.*\\[\\(.*\\)\\].*/\\1/' | sed 's/[\\^~].*//' #"
d = diff
br = branch --all
ci = commit
co = checkout
current = rev-parse HEAD
dh = diff HEAD
lg = log --graph --pretty=format:'%Cred%h..%Creset - %s %Cgreen(%cr)%Creset - %an' --abbrev-commit --date=relative
lgn = log --pretty=oneline --abbrev-commit --show-notes=*
mnff = merge --no-ff
rh = reset --soft HEAD^
st = status
pushom = push origin master:master
pushod = push origin develop:develop
pullom = pull origin master:master
pullod = pull origin develop:develop
[pull]
rebase = false
[merge]
tool = fugitive
[rerere]
enabled = true
[core]
editor = vim
excludesfile = ~/.gitignore_global
[giggle]
main-window-maximized = true
main-window-geometry = 0x0+0+0
history-view-vpane-position = 374
main-window-view = HistoryView
[user]
name = Martin Brochhaus
email = [email protected]
[http]
sslverify = false
[mergetool "fugitive"]
cmd = vim -f -c \"Gdiff\" \"$MERGED\"
[filter "hawser"]
clean = git hawser clean %f
smudge = git hawser smudge %f
required = true