-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathgitconfig
More file actions
61 lines (61 loc) · 1.81 KB
/
gitconfig
File metadata and controls
61 lines (61 loc) · 1.81 KB
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
[branch]
autosetuprebase = always
[user]
name = Colin Huang
email = sidawei@gmail.com
[alias]
co = checkout
ci = commit
d = diff -w --color-words
ds = diff --staged
l = log --graph --pretty=format:'%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
unci = uncommit
uncommit = reset --soft 'HEAD^'
unstage = reset HEAD --
undo = reset --soft HEAD~1
st = status
br = branch
replace = commit -C HEAD --amend
cc = commit --amend
sh = !git-sh
weekly = log --oneline --author=colinhuang --since=7days
daily = log --oneline --author=colinhuang --since=1days
dsf = "!f() { [ -z \"$GIT_PREFIX\" ] || cd \"$GIT_PREFIX\" && git diff --color \"$@\" | diff-so-fancy | less --tabs=4 -RFX; }; f"
subupdate = submodule foreach git pull origin master
subup = submodule update --init --recursive
subpull = !git submodule foreach git pull --tags origin master
[color]
diff = auto
status = auto
branch = auto
ui = auto
log = auto
[core]
; excludesfile = /Users/colin/gitignore/
editor = /usr/bin/vim
excludesfile = /home/colin/.gitignore_global
pager = diff-so-fancy | less --tabs=4 -RFX
[apply]
whitespace = nowarn
[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
[diff]
tool = vimdiff
[difftool]
prompt = No
[push]
default = matching
[gui]
encoding = utf-8
[i18n]
commitEncoding = utf-8
logOutputEncoding = utf-8
[color "diff-highlight"]
oldNormal = red bold
oldHighlight = red bold 52
newNormal = green bold
newHighlight = green bold 22