-
Notifications
You must be signed in to change notification settings - Fork 19
/
Copy pathgitconfig
59 lines (59 loc) · 1.86 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
[user]
name = Martin Toma
email = martin@itrinity.com
[credential]
helper = cache --timeout=3600
[core]
excludesfile = /Users/martin/.gitignore
[push]
default = simple
[color]
status = always
ui = true
[core]
editor = nvim
[alias]
a = add
aa = add --all
ap = add --patch
di = diff
ds = diff --staged
dt = difftool --no-prompt
ci = commit --verbose
cim = commit --verbose --reedit-message=HEAD --reset-author
amend = commit --amend --verbose
co = checkout
pl = pull
ps = push
pom = push origin master
pbm = push backup master
pod = push origin develop
pbd = push backup develop
rb = rebase -i HEAD~10
st = status -sb
br = branch
lo = log --oneline -n 15
lg = log --pretty=format:'%h | %cd | %an | %s' -n 15
ls = log --stat -n 5
lol = log --oneline --graph --all --decorate
g1 = log --graph --all --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%cr)%C(reset) %C(white)%s%C(reset) %C(bold white)— %cn%C(reset)%C(bold yellow)%d%C(reset)' --abbrev-commit --date=relative
g2 = log --graph --all --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%cD%C(reset) %C(bold green)(%cr)%C(reset)%C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset) %C(bold white)— %cn%C(reset)' --abbrev-commit
wc = whatchanged -p --abbrev-commit --pretty=medium
unstage = reset HEAD --
edit = "!nvim `git ls-files -m`"
[github]
user = martin-svk
[branch]
autosetuprebase = always
[diff]
tool = nvimdiff
[difftool "nvimdiff"]
cmd = diff_wrapper "$LOCAL" "$REMOTE"
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
[commit]
template = /Users/martin/.stCommitMsg