-
Notifications
You must be signed in to change notification settings - Fork 1
/
gitconfig
executable file
·62 lines (56 loc) · 1.43 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
[user]
name = rtakasuke
email = [email protected]
[color]
ui = true
status = auto
diff = auto
branch = auto
interactive = auto
grep = auto
[alias]
s = status -bs
st = status
sh = show
pl = pull
ft = fetch
c = commit
ci = commit -a
co = checkout
ad = add
ada = add .
br = branch
bra = branch -a
sm = submodule
di = diff
dim = diff master
dic = diff --cached # addされているものとdiff
dis = diff --staged # 同上(1.6.1以降)
di1 = diff HEAD~
di2 = diff HEAD~~
di3 = diff HEAD~~~
di4 = diff HEAD~~~~
di5 = diff HEAD~~~~~
di6 = diff HEAD~~~~~~
di7 = diff HEAD~~~~~~~
di8 = diff HEAD~~~~~~~~
di9 = diff HEAD~~~~~~~~~
di10= diff HEAD~~~~~~~~~~
lg = log
lgs = log --stat # logに変更されたファイルも一緒に出す
lgp = log -p # diffも一緒に出す
lgl = log --date=short --pretty=format:'%Cgreen%h %cd %Cblue%cn%x09%Creset%s' # onelineでlogを出す
rank= shortlog -s -n --no-merges
# logをtree表示
log-graph = log --graph --date=short --pretty=format:'%Cgreen%h %cd %Cblue%cn %Creset%s'
log-all = log --graph --all --color --pretty='%x09%h %cn%x09%s %Cred%d%Creset'
[core]
editor = /usr/local/bin/nvim
[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
[push]
default = simple