/
.gitconfig
76 lines (75 loc) · 2.07 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
[user]
name = takaion
email = 3522531+takaion@users.noreply.github.com
[color]
# Color setting (以下のコマンドは自動で色を付ける)
status = auto
diff = auto
interactive = auto
grep = auto
[push]
default = current
[core]
editor = vim -c \"set fenc=utf-8\"
[merge]
tool = vimdiff
ff = false
[diff]
tool = vimdiff
[alias]
s = status
st = status
sh = show
so = remote show origin
# pull / push / fetch
ft = fetch
# commit
ad = add
c = commit
ci = commit -a # All modified files
cam = commit -a --amend
co = checkout
sw = switch
swc = switch -c
# branch
br = branch
ba = branch -a
bm = branch --merged # Show merged branches
bn = branch --no-merged
# reset
sync = reset --hard
r = reset HEAD
r1 = reset HEAD~
r2 = reset HEAD~~
r3 = reset HEAD~~~
r4 = reset HEAD~~~~
r5 = reset HEAD~~~~~
rsh = reset --soft HEAD
rsh1 = reset --soft HEAD~
rsh2 = reset --soft HEAD~~
rsh3 = reset --soft HEAD~~~
rsh4 = reset --soft HEAD~~~~
rsh5 = reset --soft HEAD~~~~~
rhh = reset --hard HEAD # 取り返しのつかないことをしてしまった!
rhh1 = reset --hard HEAD~
rhh2 = reset --hard HEAD~~
rhh3 = reset --hard HEAD~~~
rhh4 = reset --hard HEAD~~~~
rhh5 = reset --hard HEAD~~~~~
# diff
di = diff
dm = diff master # master との diff
dw = diff --color-words # 単語単位で色をつけて diff
dc = diff --cached # add されているものとの diff
ds = diff --staged # 同上
d1 = diff HEAD~
d2 = diff HEAD~~
d3 = diff HEAD~~~
d4 = diff HEAD~~~~
d5 = diff HEAD~~~~~
# grep
gr = grep
gn = grep -n
# log
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
lga = log --graph --all --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative