-
Notifications
You must be signed in to change notification settings - Fork 1
/
Copy path.gitconfig
143 lines (106 loc) · 3.5 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
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
142
143
[user]
name = Michal Krejčí
email = [email protected]
[color]
ui=auto
[push]
default=current
[alias]
s=status
ss= status -s
br=branch
cl=clone
co=checkout
track="!f() { branch=$(git rev-parse --abbrev-ref HEAD) && git branch $branch --set-upstream-to origin/$branch;}; f"
di=diff
dc=diff --cached
ap=add -p
unstage = reset HEAD --
restore = checkout --
ci=commit
save = !git add -A && git commit -m 'WIP'
amend=commit --amend --reuse-message HEAD
ff=merge --ff-only
noff=merge --no-ff
r = reset
r1 = reset HEAD^
rh = reset --hard
rh1 = reset HEAD^ --hard
; undo=reset --hard
; http://haacked.com/archive/2014/07/28/github-flow-aliases/
undo = reset HEAD~1 --mixed
wipe = !git add -A && git commit -qm 'WIPE SAVEPOINT' && git reset HEAD~1 --hard
remove-merged-branches= !git branch --merged master | grep -v '\\*\\|master\\|develop' | xargs -n 1 git branch -d
ls= log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate
ld= log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=short
churn= "!f() { git log --all -M -C --name-only --format='format:' \"$@\" | sort | grep -v '^$' | uniq -c | sort | awk 'BEGIN {print \"count\tfile\"} {print $1 \"\t\" $2}' | sort -g; }; f"
pr = "!open \"$(git remote -v | grep origin | grep push | cut -f 2 | cut -d \" \" -f 1 | sed -e \"s|https://github.com/\\(.*\\)/\\(.*\\).git|https://github.com/\\1/\\2|\")/pull/new/$(git rev-parse --abbrev-ref HEAD)\""
gh = "!open \"$(git remote -v | grep origin | grep push | cut -f 2 | cut -d \" \" -f 1 | sed -e \"s|https://github.com/\\(.*\\)/\\(.*\\).git|https://github.com/\\1/\\2|\")/tree/$(git rev-parse --abbrev-ref HEAD)\""
; Fix conflicted files
fix = "!git diff --name-only --relative -z --diff-filter=U | xargs -0 ${EDITOR}"
aliases = config --get-regexp '(alias.*)'
wip = "!f() { git add -A; git ls-files --deleted -z | xargs -0 git rm; git commit -m \"--wip--\";}; f"
unwip = "!f() { gunwip; }; f"
conflicts = !git ls-files -u | cut -f 2 | sort -u
up = !git fetch && git rebase --autostash FETCH_HEAD
[core]
excludesfile = ~/.dotfiles/git/.gitignore
pager = diff-so-fancy | less --tabs=1,5 -RFX
[branch]
autosetuprebase = remote
autosetupmerge = true
[heroku]
remote = staging
[help]
autocorrect = 1
[filter "media"]
required = true
clean = git media clean %f
smudge = git media smudge %f
[filter "hawser"]
required = true
clean = git hawser clean %f
smudge = git hawser smudge %f
[diff]
renames = copies
mnemonicprefix = true
[rerere]
enabled = true
[merge]
stat = true
[git-up "bundler"]
autoinstall = true
check = true
[github]
user = mikekreeki
[pre-commit]
ruby = rvm-auto-ruby
[status]
showUntrackedFiles = all
[color "diff-highlight"]
oldNormal = red bold
oldHighlight = red bold 52
newNormal = green bold
newHighlight = green bold 22
[color "diff"]
meta = yellow bold
commit = green bold
frag = magenta bold
old = red bold
new = green bold
whitespace = red reverse
[filter "lfs"]
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
clean = git-lfs clean -- %f
# The first line resets the list of helpers so we can check Netlify's first.
[credential]
helper = ""
# This next lines include Netlify's Git Credential Helper configuration in your Git configuration.
[include]
path = /Users/mikekreeki/Library/Preferences/netlify/helper/git-config
[credential]
helper = osxkeychain
[http]
postBuffer = 157286400