settings/.gitconfig at master · birdblues/settings · GitHub

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
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
[user]

name = dhseo

email = birdblues@mac.com

[color]

ui = auto

[core]

editor = vim

autocrlf = input

excludesfile = ~/.gitignore_global

whitespace=cr-at-eol

[i18n]

commitEncoding = utf-8

logOutputEncoding = utf-8

[diff]

tool = vimdiff

[difftool]

prompt = true

[merge]

tool = vimdiff

[mergetool]

prompt = false

[help]

autocorrect = 1

[alias]

ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat

ls = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate

lnc = log --pretty=format:"%h\\ %s\\ [%cn]"

lds = log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=short

dl = "!git ll -1"

dlc = diff --cached HEAD^

graph1 = log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all

graph2 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n''          %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all

graph = !"git graph1"

co = checkout

br = branch

ci = commit

st = status

lg = !"git graph1"

unstage = reset HEAD --

last = log -1 HEAD

sl = stash list

sa = stash apply

ss = stash save

r = reset

r1 = reset HEAD^

r2 = reset HEAD^^

rh = reset --hard

rh1 = reset HEAD^ --hard

rh2 = reset HEAD^^ --hard

cp = cherry-pick

st = status -s

cl = clone

diff = diff --word-diff

dc = diff --cached

lasttag = describe --tags --abbrev=0

lt = describe --tags --abbrev=0

la = "!git config -l | grep alias | cut -c 7-"

gra = "!f() { A=$(pwd) && TOPLEVEL=$(git rev-parse --show-toplevel) && cd $TOPLEVEL && git grep --full-name -In $1 | xargs -I{} echo $TOPLEVEL/{} && cd $A; }; f"

grep = grep -Ii

gr = grep -Ii

f = "!git ls-files | grep -i"

dr  = "!f() { git diff "$1"^.."$1"; }; f"

lc  = "!f() { git ll "$1"^.."$1"; }; f"

diffr  = "!f() { git diff "$1"^.."$1"; }; f"


[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