-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
63 lines (63 loc) · 2.02 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
[user]
name = kxbmap
email = [email protected]
[color]
ui = auto
[push]
default = simple
[core]
autocrlf = false
quotepath = false
pager = less
[alias]
s = status
st = status
ss = status -s
sh = show
so = remote show origin
# rebase
rbm = rebase master
rbc = rebase --continue
rba = rebase --abort
rbi = rebase -i
# merge
mn = merge --no-ff
mnfc = merge --no-ff --no-commit
# comit
c = commit
# checkout
co = checkout
cb = checkout -b # branch切ってcheckoutする
ct = checkout --track # remoteのbranchを追跡
cm = checkout master
# branch
br = branch
ba = branch -a # originも含めた全てのbranchを表示
bm = branch --merged # merge済みのbranchを表示
bn = branch --no-merged # mergeしてないbranchを表示
bo = branch -r # remote branchを表示
# log関連
wc = whatchanged # logに変更されたファイルも一緒に出す
ls = log --stat # logに変更されたファイルも一緒に出す
lp = log -p # diffも一緒に出す
la = log --pretty=\"format:%ad %h (%an): %s\" --date=short # ざっくりログ出す
lr = log origin # originのlog
ll = log --date=short --pretty=format:'%Cgreen%h %cd %C(cyan)%cn%x09%Creset%s' # onelineでlogを出す
oneline = log --pretty=oneline
ranking = shortlog -s -n --no-merges
# logをtree表示
log-graph = log --graph --date=short --pretty=format:'%Cgreen%h %cd %C(cyan)%cn %Creset%s'
log-all = log --graph --all --color --pretty='%x09%h %cn%x09%s %Cred%d%Creset'
# diff関連
di = diff
dm = diff master # masterとのdiff
dw = diff --color-words # 単語単位でいろつけてdiff
dc = diff --cached # addされているものとのdiff
ds = diff --staged # 同上
# grep関連
gr = grep
gn = grep -n
[include]
path = .gitconfig.local
[winUpdater]
recentlySeenVersion = 2.20.1.windows.1