forked from patricksrobertson/dotfiles
-
Notifications
You must be signed in to change notification settings - Fork 0
/
gitconfig.erb
58 lines (58 loc) · 1.83 KB
/
gitconfig.erb
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
# vim: syntax=gitconfig ft=gitconfig
# See: man gitconfig
# or http://www.kernel.org/pub/software/scm/git/docs/git-config.html
<%= IO.read(File.join(File.dirname(__FILE__), 'gitconfig.local')) %>
[init]
templatedir = <%= File.expand_path(File.dirname(__FILE__)) %>/git-template-dir
[alias]
a = add
aa = !git add -A && git status -sb
c = commit -m
cibuild = push origin HEAD:wm-ci -f
co = checkout
cob = checkout -b
ir = !git rebase -i origin/master
done = !git fetch && git rebase origin/master && git checkout master && git merge @{-1} && rake && git push
rmb = !sh -c 'git branch -D $1 && git push origin :$1' -
cleanup = !git remote prune origin && git gc && git clean -df && git stash clear
who = !git shortlog -sn
lcrev = log --reverse --no-merges --stat @{1}..
next = !git add . && git rebase --continue
unfuck = reset --hard HEAD
l = log --graph --pretty=format:'%Cred%h%Creset %an: %s - %Creset %C(yellow)%d%Creset %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
la = log --all --graph --pretty=format:'%Cred%h%Creset %an: %s - %Creset %C(yellow)%d%Creset %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
ll = log --stat --graph --pretty=format:'%Cred%h%Creset %an: %s - %Creset %C(yellow)%d%Creset %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
d = diff --word-diff
[color]
ui = auto
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
[color "status"]
added = yellow
changed = green
untracked = cyan
[core]
editor = `which vim`
excludesfile = ~/.gitignore
[apply]
whitespace = nowarn
[http]
sslverify = false
postBuffer = 1824288000
[rerere]
enabled = 1
[push]
default = current
[web]
browser = open
[diff]
tool = vimdiff
[branch "master"]
mergeoptions = --no-ff