-
Notifications
You must be signed in to change notification settings - Fork 13
/
.gitconfig
72 lines (72 loc) · 2.29 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
[include]
path = ~/Dropbox/conf/gitconfig.local # for my user name and email address
[push]
default = simple
[color]
status = auto
diff = auto
branch = auto
interactive = auto
grep = auto
[alias]
st = status --short --branch
sh = show
so = remote show origin
ad = add
c = commit -v
ci = commit -a
cam = commit -a --amend
co = checkout
psuh = push
# branch
br = branch
ba = branch -a # Show all the branches including origin
bm = branch --merged # Show the branch already merged
bn = branch --no-merged # Show the branch not merged
# log
lp = log -p # with diff
lr = log origin # log in origin
# 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'
# diff
dm = diff master # diff against master
dw = diff --color-words # diff with color words
dc = diff --cached # diff ageinst cached one
# edit unmerged file when conflict occured
edit-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; vim `f`"
# add unmerged file when conflict occured
add-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; git add `f`"
# grep
gr = grep
gn = grep -n
[core]
pager = diff-so-fancy | less --tabs=4 -RFX
excludesfile = /Users/fujimotoshotaro/.gitignore_global
[difftool "sourcetree"]
cmd = "diff-so-fancy "
path =
[mergetool "sourcetree"]
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
[user]
name = 藤本 將太郎
email = [email protected]
[filter "lfs"]
process = git-lfs filter-process
required = true
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
[diff "jupyternotebook"]
command = git-nbdiffdriver diff
[merge "jupyternotebook"]
driver = git-nbmergedriver merge %O %A %B %L %P
name = jupyter notebook merge driver
[difftool "nbdime"]
cmd = git-nbdifftool diff \"$LOCAL\" \"$REMOTE\" \"$BASE\"
[difftool]
prompt = false
[mergetool "nbdime"]
cmd = git-nbmergetool merge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
[mergetool]
prompt = false