forked from reef-technologies/handbook
-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy path.gitconfig
60 lines (58 loc) · 1.56 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
[core]
editor = vim
#pager = diff-so-fancy | less --tabs=4 -RFX
[color]
ui = always
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff"]
meta = yellow bold
commit = green bold
frag = magenta bold
old = red bold
new = green bold
whitespace = red reverse
[color "diff-highlight"]
oldNormal = red bold
oldHighlight = "red bold 52"
newNormal = "green bold"
newHighlight = "green bold 22"
[color "status"]
added = yellow
changed = green
untracked = cyan
[diff]
compactionHeuristic = true # >= 2.9.0
[rebase]
autosquash = true
[rerere]
enabled = true
[merge]
ff = false
log = true
conflictstyle = diff3
[alias]
st = status
ci = commit
br = branch
co = checkout
ls = ls-files
pullff = pull --ff-only --prune
ff = merge --ff-only
df = diff
dfc = diff --cached
lo = log -p
lc = log ORIG_HEAD.. --stat --no-merges
who = shortlog -s --
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
lga = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative --all
# show-branch
pushr = push origin HEAD:refs/for/master
edit-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; vim `f`"
aliases = !git config --get-regexp 'alias.*' | colrm 1 6 | sed 's/[ ]/ = /'
[push]
default = upstream
#[commit]
# gpgsign = true