-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
63 lines (59 loc) · 2.21 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
61
62
63
[user]
name = Karl Velicka
email = karlvelicka@gambitresearch.com
[alias]
co = checkout
# one-line commit summaries with graph view
lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
# similar to above but with full commit messages? I don't really use this one tbh
lgm = log --graph --date=relative --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset%n%w(0,4,4)%-b%n%n%-N'
# "git log patch" - commit history with full messages and diffs (aka patches)
lp = log -p --color --abbrev-commit
# list local branches in reverse chrono order
br = for-each-ref --sort=committerdate refs/heads/ --format='%(committerdate:short) %(refname:short)'
# unused by me
l = "!bash -c \"git log \"$@\" --all --graph --branches --decorate --abbrev-commit --date=short --pretty=format:'%C(yellow)%h%Creset%C(auto)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset %C(blue)%G?%Creset'\""
# "git log patch branch" - same as `lp` but only shows commits between HEAD and origin/master
lpb = "!bash -c \"git log -p $(git merge-base HEAD origin/master)..\""
# "git log patch branch reversed" - same as `lpp` but reverse order
lpbr = "!bash -c \"git log -p $(git merge-base HEAD origin/master).. --reverse\""
s = status
d = difftool -y
cc = commit -a
[core]
editor = nvim
[filter "media"]
required = true
clean = git media clean %f
smudge = git media smudge %f
[filter "hawser"]
clean = git hawser clean %f
smudge = git hawser smudge %f
required = true
[color]
ui = auto
[filter "lfs"]
clean = git-lfs clean %f
smudge = git-lfs smudge %f
required = true
[url "git://github.com/ghc/packages-"]
insteadOf = git://github.com/ghc/packages/
[url "http://github.com/ghc/packages-"]
insteadOf = http://github.com/ghc/packages/
[url "https://github.com/ghc/packages-"]
insteadOf = https://github.com/ghc/packages/
[url "ssh://git@github.com/ghc/packages-"]
insteadOf = ssh://git@github.com/ghc/packages/
[url "git@github.com:/ghc/packages-"]
insteadOf = git@github.com:/ghc/packages/
[push]
default = current
[merge]
conflictStyle = diff3
[diff]
submodule = log
[pull]
rebase = true
ff = only
[init]
defaultBranch = main