-
Notifications
You must be signed in to change notification settings - Fork 2
/
.gitconfig
119 lines (90 loc) · 3.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
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
[github]
user = rubyconsumer
token = xxxxxxxxxxxxxxxxxxxxxxxxxxxxx
[user]
name = Winston Tsang
email = rubyconsumer [at] rubyconsumer [dot] com
[alias]
st = status
sta = stash
ci = commit
br = branch
co = checkout
df = diff
lf = log ORIG_HEAD.. --stat --no-merges
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ar)%Creset %C(ul)(%cr)%Creset %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
lgstat = log --stat --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ar)%Creset %C(ul)(%cr)%Creset %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
loc = log --pretty=format:'%C(yellow)%h%Creset %>(12)%C(green)%ar%Creset %<(18)%C(bold blue)%aN%Creset %C(red)%d%Creset %s'
lo1 = log --graph --oneline --decorate
lon = log --show-notes=* --graph --decorate
lan = log --graph --decorate
lpatch = log -p
last = log -1 HEAD
hist = log --pretty=format:'%C(green)%ad%Creset | %h | %s%d [%an]' --graph --date=iso
rt = remote
wc = whatchanged
nrspec = notes --ref=rspec add
nrspec-js = notes --ref=rspec_js add
ncukes = notes --ref=cucumber add
pushnr = push origin refs/notes/rspec
pushnc = push origin refs/notes/cucumber
ncore = push core +refs/notes/*:refs/notes/*
norigin = push origin +refs/notes/*:refs/notes/*
track = branch --set-upstream
branch-owner = for-each-ref --format='%(committerdate) %09 %(authorname) %09 %(refname)'
aliases = config --get-regexp alias
compare = log --left-right --graph --cherry-pick --oneline --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %C(bold blue)<%an>%Creset'
compare-simple = log --left-right --graph --cherry-pick --oneline
intercommit = !sh -c 'git show "$1" > .git/commit1 && git show "$2" > .git/commit2 && interdiff .git/commit[12] | less -FRS' -
edit-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; vim `f`"
add-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; git add `f`"
#[remote "origin"]
# fetch = +refs/notes/*:refs/notes/*
# push = +refs/notes/*:refs/notes/*
[push]
default = tracking
[core]
legacyheaders = false
excludesfile = /Users/wtsang/.gitignore_global
editor = vim
[pager]
color = true
[apply]
whitespace = nowarn
[merge]
tool = opendiff
[repack]
usedeltabaseoffset = true
[instaweb]
local = true
httpd = webrick
port = 9999
[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
[color]
branch = auto
diff = auto
status = auto
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
whitespace = red reverse
[color "status"]
added = yellow
changed = green
untracked = cyan
[rerere]
enabled = true
# auto use the prune flag when fetching
[fetch]
prune = true