-
Notifications
You must be signed in to change notification settings - Fork 0
/
gitconfig
40 lines (40 loc) · 1.09 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
[alias]
edit = config --global --edit
graph = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'
vdiff = "!f() { git diff $@ | vi -; }; f"
stats = "!f() { git log --format='%an' "$@" | sort | uniq -c | sort -rn | head; }; f"
log1 = log --pretty=oneline
logp = log --patch -1
logr = log ..@{u}
logl = log @{u}..
st = status --short --branch
tg = log --tags --simplify-by-decoration --date=format:'%Y-%m-%d %H:%M' --pretty='format:%cd %d'
irb = "!f() { git rebase -i HEAD~$1; }; f"
srb = !git fetch --all && git rebase
[color]
ui = auto
[core]
excludesfile = ~/.gitignore
pager = less -FRX
[diff]
#remove a/ b/ prefix
noprefix = true
tool = vimdiff
[difftool]
prompt = false
[init]
#.git/hook/ctags
templatedir = ~/.git_template
[log]
#use short form of sha1
abbrevCommit = true
date = local
[pull]
#pull if only all commits were pushed
ff = only
[merge]
ff = false
tool = kdiff3
[mergetool]
#do not store .orig after merge
keepBackup = false