forked from larrylv/dotfiles
-
Notifications
You must be signed in to change notification settings - Fork 1
/
Copy pathgitconfig.erb
83 lines (83 loc) · 3.16 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
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
[user]
name = <%= print("Your Name: "); STDOUT.flush; STDIN.gets.chomp %>
email = <%= print("Your Email: "); STDOUT.flush; STDIN.gets.chomp %>
[github]
user = larrylv
[core]
excludesfile = <%= ENV['HOME'] %>/.gitignore
pager = less -+FRSX -FRX
editor = vim
autocrlf = input
safecrlf = true
whitespace = cr-at-eol
[alias]
al = !git config --list | grep 'alias\\.' | sed 's/alias\\.\\([^=]*\\)=\\(.*\\)/\\1\t=> \\2/' | sort
b = branch -avv --color
bd = branch -D
bn = branch -avv --color --no-merged
bm = branch -avv --color --merged
br = branch
changes = diff --stat -r
ci = commit
cia = commit --amend
co = checkout
dc = diff --cached
delete = !git ls-files -z --deleted | xargs -0 git rm
df = diff
diff = diff --ignore-space-change --color
ds = diff --staged
dsf = "!f() { [ -z \"$GIT_PREFIX\" ] || cd \"$GIT_PREFIX\" && git diff --color \"$@\" | diff-so-fancy | less --tabs=4 -RFX; }; f"
dt = difftool
fa = fetch --all
fp = fetch -p --all
hist = log --graph --decorate --pretty=oneline --abbrev-commit --all --name-status
ignored = !git ls-files -v | grep "^[[:lower:]]"
l = log --graph --pretty=format:'%Cred%h%Creset %Cblue%an%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
last = log -n 1 -p --color
lg = log --graph --pretty=format:'%Cred%h%Creset %Cblue%an%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative -10
ls-ignored = ls-files --exclude-standard --ignored --others
mf = merge --no-ff
news = log -p HEAD@{1}..HEAD@{0}
next = !git checkout `git rev-list HEAD..master | tail -1`
oneline = log --graph --decorate --pretty=oneline --abbrev-commit --all
pb = pull --rebase
pick = cherry-pick
pl = pull
prev = checkout @^
ps = push
pushall = push --recurse-submodules=on-demand
rbs = !sh -c 'git co $1 && git pull && git co @{-1} && git rebase -i $1' -
sb = show-branch
show-next = !git show `git rev-list HEAD..master | tail -1`
show-prev = !git show @^
ss = stash save
sl = stash list -p --color
sp = stash pop
st = status
standup = shortlog --since=yesterday
svn-pb = svn rebase
svn-ps = svn dcommit
svn-pull = svn fetch
svn-push = svn dcommit
today = shortlog --since=midnight
uncommit = !git reset --soft HEAD^ && git reset HEAD .
unstage = reset HEAD .
wdiff = diff --word-diff
who = shortlog -s -n --no-merges
[merge]
tool = vimdiff
conflictstyle = diff3
summary = true
[push]
default = tracking
[color]
ui = always
diff = auto
status = auto
branch = auto
interactive = auto
[i18n]
commitEncoding = utf8
logOutputEncoding = utf8
[diff]
compaction-heuristic = true