-
Notifications
You must be signed in to change notification settings - Fork 2
/
.gitconfig
71 lines (67 loc) · 2.04 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
[color]
diff = auto
status = auto
branch = auto
[user]
name = Christian Hammond
email = christian@beanbaginc.com
signingkey = C150D7EB
[alias]
amend = commit --amend
br = branch
ci = commit
cia = commit --all
co = checkout
cp = cherry-pick
d = diff
dc = diff --cached
rebase-this = "!git rebase --onto $1 HEAD^ #"
rebase-here = "!git rebase HEAD $1 #"
stat = status
st = status
nb = checkout -b
pa = !sh -c 'git push origin --follow-tags && git push chipx86 --follow-tags'
pat = !sh -c 'git push --tags origin && git push --tags chipx86'
p = push origin --follow-tags
pt = push --tags origin
rc = rebase-chain
lg = log --graph --pretty=format:'%C(auto,red bold)%h%C(auto,reset) -%C(auto,yellow)%d%C(auto,reset) %s %C(auto,green)(%cr - %cd) %C(auto,bold blue)<%an>%C(auto,reset)' --abbrev-commit --date=short
lga = "!git lg --all $*"
lgplain = "!git lg --no-color $*"
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`"
purr = pull --rebase
int = integrate
wip = "!git commit -m '[WIP] Summary of commit\n\nTODO:\n *' -e --allow-empty"
nbw = "!git nb $1; git wip #"
[core]
excludesfile = /Users/chipx86/.gitignore_global
pager = less -S
[color "diff"]
frag = yellow bold
old = red bold
new = green bold
[color "status"]
added = green bold
updated = green bold
changed = red bold
untracked = red bold
[diff]
tool = "Kaleidoscope"
[difftool]
prompt = false
[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
[push]
default = matching
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true
[git-j]
alias = m=master