-
Notifications
You must be signed in to change notification settings - Fork 1
/
gitconfig
56 lines (53 loc) · 1.87 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
[user]
name = Jonas Falck
email = [email protected]
[push]
default = simple
[core]
excludesfile = /home/jonaz/.gitignore
pager = delta
[web]
browser = google-chrome-stable
[credential]
helper = cache --timeout 3600
[alias]
create-pull-request = !sh -c 'stash pull-request $0'
pr = !sh -c 'stash-browse -p $0'
lg1 = log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all
lg2 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all
lg = !"git lg1"
lg3 = log --pretty=format:"%h%x09%an%x09%ad%x09%s"
meld = "!f() { git difftool -d $1 $2; }; f"
st = status
ci = commit
co = checkout
p = pull
recentwork = log --no-merges --committer jonas.falck
trackpush = "!git push --set-upstream origin `git symbolic-ref --short HEAD`"
sync = "!git pull && sync_server"
rb = "!f() { git fetch origin \"$1\" && git rebase FETCH_HEAD;}; f"
[pull]
rebase = true
[interactive]
diffFilter = delta --color-only
[delta]
navigate = true # use n and N to move between diff sections
line-numbers = true
;syntax-theme = TwoDark
syntax-theme = Solarized (dark)
width = 1
minus-style = syntax "#450a15"
minus-emph-style = syntax "#600818"
plus-style = syntax "#0b4820"
plus-emph-style = syntax "#175c2e"
hunk-header-style = syntax bold
hunk-header-decoration-style = omit
file-style = yellow italic
file-decoration-style = yellow ul
line-numbers-zero-style = "#4b5263"
line-numbers-left-format = "{nm:^4} "
line-numbers-right-format = "{np:^4} "
[merge]
conflictstyle = diff3
[diff]
colorMoved = default