rkmiec/yadm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Git: add few bits to improve mergetool and diff

Browse Source
This commit is contained in:
Robert Kmieć
2023-08-17 23:44:27 +02:00
parent 89b4343ca1
commit 3729e67247
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
.gitconfig
View File

@@ -21,10 +21,17 @@
smtpserver = smtp.gmail.com smtpserver = smtp.gmail.com
smtpuser = robert.r.kmiec@gmail.com smtpuser = robert.r.kmiec@gmail.com
smtpserverport = 587 smtpserverport = 587
[diff]
tool = vimdiff
[merge] [merge]
tool = vimdiff conflictstyle = diff3
tool = nfugitive
[mergetool "nfugitive"]
cmd = nvim -c "Gvdiffsplit!" "$MERGED"
[diff]
tool = nvimdiff
[difftool "nvimdiff"]
cmd = nvim -d "$LOCAL" "$REMOTE"
[diff "markdown"]
xfuncname = "^#+.*$"
[filter "lfs"] [filter "lfs"]
clean = git-lfs clean -- %f clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f smudge = git-lfs smudge -- %f
@@ -33,13 +40,13 @@
[alias] [alias]
cm = commit cm = commit
co = checkout co = checkout
br = branch br = branch -vva
st = status st = status
d = diff d = diff
dc = diff --cached dc = diff --cached
short = rev-parse --short --verify HEAD short = rev-parse --short --verify HEAD
update = !git stash && git pull --rebase && git stash pop && git submodule update --init --recursive update = !git stash && git pull --rebase && git stash pop && git submodule update --init --recursive
diff-image = "!f() { cd -- \"${GIT_PREFIX:-.}\"; GIT_DIFF_IMAGE_ENABLED=1 git diff \"$@\"; }; f" diff-image = "!f() { cd -- \"${GIT_PREFIX:-.}\"; GIT_DIFF_IMAGE_ENABLED=1 git diff \"$@\"; }; f"
[interactive] [interactive]
diffFilter = delta --color-only diffFilter = delta --color-only
[delta] [delta]
@@ -58,6 +65,8 @@
cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
[init] [init]
defaultBranch = master defaultBranch = master
[diff "image"] #[diff "image"]
command = /home/kmcr/tools/git-diff-image/git_diff_image # command = /home/kmcr/tools/git-diff-image/git_diff_image
textconv = imgcat # textconv = imgcat
[advice]
detachedHead = false