-
Notifications
You must be signed in to change notification settings - Fork 1
/
gitconfig
75 lines (73 loc) · 2.13 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
[user]
useConfigOnly = true
email = [email protected]
name = Peter Hicks
[color]
diff = auto
status = auto
branch = auto
interactive = auto
ui = true
pager = true
[color "diff"]
whitespace = red reverse
meta = yellow
frag = magenta bold
commit = yellow bold
old = red bold
new = green bold
[core]
#pager = diff-so-fancy | less --tabs=4 -RFX
whitespace=fix,-indent-with-non-tab,trailing-space,cr-at-eol
excludesfile = ~/.gitignore
[alias]
A = add -A
co = checkout
g = grep --break --heading --line-number
l = pull
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
lr = pull --rebase
lu = ls-files -o --exclude-standard
p = push
pd = push -u origin HEAD
rb = for-each-ref --count=10 --sort=-committerdate refs/heads/ --format="%(refname:short)"
recent-branches = for-each-ref --count=10 --sort=-committerdate refs/heads/ --format="%(refname:short)"
riom = rebase -i origin/master
s = status
undo = reset --soft "HEAD^"
wc = whatchanged --name-only --pretty="" origin..HEAD
wdiff = diff --color-words
#[mergetool "fugitive"]
# cmd = nvim -f -c \"Gdiff\" \"$MERGED\"
[push]
default = current
[grep]
lineNumber = true
#[merge]
# tool = fugitive
[github]
user = petong
[color "diff-highlight"]
oldNormal = red bold
oldHighlight = red bold 52
newNormal = green bold
newHighlight = green bold 22
[merge]
tool = vim_mergetool
conflictstyle = diff3
[mergetool "vim_mergetool"]
cmd = nvim -f -c "MergetoolStart" "$MERGED" "$BASE" "$LOCAL" "$REMOTE"
trustExitCode = true
[url "[email protected]:"]
insteadOf = https://gitlab.ops.ripple.com/
[pull]
rebase = true
[init]
defaultBranch = main
[branch]
autoSetupMerge = simple
[filter "lfs"]
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
clean = git-lfs clean -- %f