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

Git: moultiple improvements (mostly optimization)

Browse Source
This commit is contained in:
Robert Kmieć
2024-02-26 12:57:34 +01:00
parent 373581fd36
commit fc417a90fd
1 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
.gitconfig
View File

@@ -9,6 +9,8 @@
autocrlf = false autocrlf = false
excludesfile = /home/rkmiec/.config/git/ignore excludesfile = /home/rkmiec/.config/git/ignore
symlinks = true symlinks = true
attributesfile = ~/.gitattributes
fsmonitor = true
#attributesfile = ~/.gitattributes #attributesfile = ~/.gitattributes
[help] [help]
autocorrect = 1 autocorrect = 1
@@ -46,7 +48,7 @@
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]
@@ -60,13 +62,28 @@
rebase = true rebase = true
[commit] [commit]
template = .gitmessage template = .gitmessage
verbose = true verbose = false
[mergetool "vimdiff"] [mergetool "vimdiff"]
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
[diff "model"]
command = /home/kmcr/tools/git-diff-image/git_diff_image
textconv = imgcat
[advice] [advice]
detachedHead = false detachedHead = false
[submodule]
recurse = false
[rerere]
enabled = true
[column]
ui = auto
[branch]
sort = -commiterdate
[fetch]
writeCommitGraph = true
[maintenance]
repo = /home/kmcr/repos/hems/hemsmilsimulation