-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathgitconfig
78 lines (77 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
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
[user]
email = roli@schilter.me
name = Roli Schilter
editor = vim
[core]
whitespace = trailing-space,space-before-tab,cr-at-eol,tab-in-indent
editor = vim
excludesfile = ~/.gitignore
pager = diff-so-fancy | less --tabs=4 -RFX
[merge]
tool = gvimdiff
[branch]
autosetuprebase = always
[push]
default = current
[color]
ui = true
diff = auto
status = auto
branch = auto
[color "status"]
added = green
changed = yellow
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[web]
browser = chromium
[diff]
mnemonicprefix = true
compactionHeuristic = true
[notes]
displayRef = *
[alias]
a = commit --all
ap = add --patch
ca = commit --amend
cp = checkout --patch
co = checkout
pr = pull --rebase
pf = push --force-with-lease
br = branch -v
ci = commit
s = status -sb
sl = stash list
sp = stash pop
sd = diff stash@{0}
lg = log --graph --pretty=format:'%Cred%h%Creset%C(yellow)%d%Creset %s %Cgreen(%cr) %C(blue)%an%Creset'
li = log --graph --pretty=format:'%Cred%h%Creset%C(yellow)%d%Creset %s %Cgreen(%ci) %C(blue)%an%Creset'
lc = log --graph --pretty=format:'%C(yellow)%d%Creset %s'
lp = log -p
ls-subtrees = !"git log | grep git-subtree-dir | awk '{ print $2 }'"
lw = whatchanged
d = diff
dc = diff --cached
changes = log -p ..origin
ds = stash show -u
df = diff ..origin
sm = submodule
unstage = reset HEAD --
undo = reset --soft HEAD^
pum = !"git fetch -v origin; git fetch -v upstream; git merge upstream/main"
pur = !"git fetch -v origin; git fetch -v upstream; git rebase upstream/main"
puh = push origin HEAD
pft = push --follow-tags
rc = rebase --continue
smui = submodule update --init
rbi = rebase -i HEAD~2
rbim = rebase -i origin/main
mnf = merge --no-ff
[commit]
verbose = true
[includeIf "gitdir:~/weave/"]
path = ~/weave/.gitconfig
[init]
defaultBranch = main