-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathgitconfig
60 lines (60 loc) · 1.55 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
[user]
name = Marc Zych
email = [email protected]
[github]
user = marczych
[core]
excludesfile = ~/dotfiles/gitignore
[color]
ui = true
[alias]
addp = add -p
alias = config --get-regexp ^alias\\.
ap = add -p
catpc = commit -a --amend -C HEAD
ci = commit
cia = commit -a
co = checkout
copy-sha = "!git rev-parse HEAD | pbcopy"
cp = cherry-pick
cur = rev-parse HEAD
di = diff --patience --find-renames --find-copies
dim = diff --patience --find-renames --find-copies origin/master...
ds = diff --cached --find-renames --find-copies
f = fetch
fm = fetch origin master
g = grep --line-number
gl = grep -l
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cd) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
lgm = lg origin/master..
m = merge --no-edit
pfwl = push --force-with-lease
pl = push --set-upstream
r = rebase
rb = recent-branches
rc = rebase --continue
rh = reset --hard
s = submodule
sb = start-branch
sha = rev-parse HEAD
smb = show-merge-base
st = status -sb
std = diff HEAD --stat
sui = submodule update --init --recursive
ur = reset --hard @{u}
[log]
date = local
[push]
default = current
[merge]
conflictstyle = diff3
tool = neovimdiff
[mergetool "neovimdiff"]
cmd = /usr/local/bin/nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
keepBackup = false
[fetch]
prune = true
[diff]
renameLimit = 1000000
[rerere]
enabled = true