-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy path.gitconfig
94 lines (80 loc) · 1.78 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
[core]
excludesfile = ~/.gitignore
[user]
name = Change Me
email = [email protected]
username = rkamat
[push]
default = simple
[rerere]
enabled = true
[alias]
a = add
ad = add
b = branch
ba = branch -a
br = branch
bs = bisect
c = commit
ca = commit -a
co = checkout
ch = checkout
d = diff
da = diff HEAD
dh = diff HEAD
di = diff
dc = diff --cached
ds = diff --staged
wd = diff --color-words
dg = difftool --gui
dgc = difftool --gui --cached
dt = difftool
dtc = difftool --cached
g = grep
h = help
he = help
l = log --topo-order --decorate
ls = log --topo-order --decorate --stat
l5 = log --topo-order --decorate -5
l0 = log --topo-order --decorate -10
l10 = log --topo-order --decorate -10
lo = log --topo-order --oneline
lg = log --graph --topo-order --decorate
lgs = log --graph --topo-order --decorate --stat
lgo = log --graph --topo-order --decorate --oneline
glo = log --graph --topo-order --decorate --oneline
m = mergetool
mt = mergetool
mtv = mergetool --tool=vimdiff
pullall = "!f(){ git pull \"$@\" && git submodule update --init --recursive; }; f"
pall = "!f(){ git pull \"$@\" && git submodule update --init --recursive; }; f"
praise = blame
sg = "!f(){ git difftool --gui \"$@\"^..\"$@\"; }; f"
sh = show
ws = show --color-words
s = status
st = status
stat = status
su = submodule update --init
create-pull-request = !sh -c 'stash pull-request $0'
[color]
ui = auto
[credential]
helper = cache --timeout=3600
[diff]
rename = copy
[merge]
tool = p4merge
[mergetool]
prompt = false
keepBackup = false
[mergetool "p4merge"]
path = /Applications/p4merge.app/Contents/MacOS/p4merge
[diff]
tool = rw-vimdiff
guitool = p4merge
[difftool]
prompt = false
[difftool "rw-vimdiff"]
cmd = vimdiff $LOCAL $REMOTE
# vim: set ts=8 sts=8 sw=8: