-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
102 lines (85 loc) · 2.41 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
[core]
whitespace=fix,-indent-with-non-tab,trailing-space,cr-at-eol,space-before-tab
quotepath = false # Fix cyrillic in paths
excludesfile = ~/.gitignore
pager = less -SFX
[diff]
noprefix = true
# tool = ws
algorithm = patience
[merge]
tool = vimdiff # ws
log = true
conflictstyle = diff3
[mergetool "ws"]
cmd = webide merge $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE") $(cd $(dirname "$BASE") && pwd)/$(basename "$BASE") $(cd $(dirname "$MERGED") && pwd)/$(basename "$MERGED")
trustExitCode = true
[mergetool "splice"]
cmd = "vim -f $BASE $LOCAL $REMOTE $MERGED -c 'SpliceInit'"
trustExitCode = true
[difftool "ws"]
cmd = webide diff $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE")
trustExitCode = true
[branch]
autosetuprebase = always
[push]
default = current
[color]
diff = yes
ui = auto
# ui = true
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff"]
meta = yellow
frag = magenta
old = red
new = green
whitespace = red reverse
[color "status"]
added = yellow
changed = green
untracked = cyan
[alias]
st = status
ci = commit
cp = cherry-pick
br = branch
co = checkout
di = diff
dc = diff --cached
ds = diff --staged
lg = log -p
l = log --graph --decorate --pretty=oneline --abbrev-commit --all
lod = log --graph --decorate --format='%h %ad %s' --date=short
lol = log --graph --decorate --pretty=oneline --abbrev-commit
lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
hist = log --pretty=format:'%C(yellow)%h%C(reset) %ad | %C(75)%s%C(reset) %C(yellow)%d%C(reset) [%an]' --graph --date=short --branches --all
pr = pull-request
rb = rebase
ls = ls-files
am = commit --amend
amend = commit --amend -C HEAD
undo = reset --soft HEAD^
standup = log --since '1 day ago' --oneline --author <YOUREMAIL>
# Show files ignored by git:
ign = ls-files -o -i --exclude-standard
# Search commits by message
search = "!f() { git log --all --grep=$1; }; f"
# Find merge commit. Usage: `git fm 0c23f92`.
fm = "!sh -c 'git show `git rev-list --ancestry-path $0..dev --merges | tail -f`'"
[tag]
sort = version:refname
[url "git@github.com:"]
pushInsteadOf = "gh:"
pushInsteadOf = "git://github.com/"
[url "git://github.com/"]
insteadOf = "gh:"
[help]
autocorrect = 1
[rebase]
autoStash = true
[pull]
rebase = true