41 lines
1.2 KiB
Text
41 lines
1.2 KiB
Text
[gui]
|
|
encoding = utf-8
|
|
[protocol]
|
|
version = 2
|
|
[filter "lfs"]
|
|
required = true
|
|
clean = git-lfs clean -- %f
|
|
smudge = git-lfs smudge -- %f
|
|
process = git-lfs filter-process
|
|
[alias]
|
|
ap = add -p
|
|
co = checkout
|
|
ci = commit
|
|
st = status
|
|
br = branch
|
|
cm = checkout master
|
|
cl = !git branch -d $(git branch --format '%(refname:lstrip=2)' --merged master | grep -v master)
|
|
loga = log --oneline --decorate --graph --all
|
|
logd = loga --simplify-by-decoration
|
|
pushmerge = push -o merge_request.merge_when_pipeline_succeeds
|
|
pushmr = push -o merge_request.create -o merge_request.merge_when_pipeline_succeeds
|
|
uncommit = reset --soft HEAD^
|
|
copr = "!f() { git fetch origin pull/$1/head:pr/$1 && git co pr/$1;}; f"
|
|
comr = "!f() { git fetch origin merge-requests/$1/head:mr/$1 && git co mr/$1;}; f"
|
|
[url "ssh://git@code.waarp.fr:2222"]
|
|
insteadOf = https://code.waarp.fr
|
|
[core]
|
|
pager = delta --dark --syntax-theme 'Solarized (dark)'
|
|
# define command which will be used when "nvim" is set as a merge tool
|
|
[mergetool "nvim"]
|
|
cmd = nvim -d $LOCAL $MERGED $REMOTE -c 'wincmd l'
|
|
[merge]
|
|
#tool = vimdiff
|
|
tool = nvim
|
|
guitool = meld
|
|
[pull]
|
|
rebase = false
|
|
[init]
|
|
defaultBranch = main
|
|
[commit]
|
|
gpgsign = true
|