diff --git a/.gitconfig b/.gitconfig index 68601d8..5c35b32 100644 --- a/.gitconfig +++ b/.gitconfig @@ -9,6 +9,8 @@ autocrlf = false excludesfile = /home/rkmiec/.config/git/ignore symlinks = true + attributesfile = ~/.gitattributes + fsmonitor = true #attributesfile = ~/.gitattributes [help] autocorrect = 1 @@ -46,7 +48,7 @@ dc = diff --cached short = rev-parse --short --verify HEAD 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] diffFilter = delta --color-only [delta] @@ -60,13 +62,28 @@ rebase = true [commit] template = .gitmessage - verbose = true + verbose = false [mergetool "vimdiff"] cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' [init] defaultBranch = master -#[diff "image"] -# command = /home/kmcr/tools/git-diff-image/git_diff_image -# textconv = imgcat +[diff "image"] + command = /home/kmcr/tools/git-diff-image/git_diff_image + textconv = imgcat +[diff "model"] + command = /home/kmcr/tools/git-diff-image/git_diff_image + textconv = imgcat [advice] detachedHead = false +[submodule] + recurse = false +[rerere] + enabled = true +[column] + ui = auto +[branch] + sort = -commiterdate +[fetch] + writeCommitGraph = true +[maintenance] + repo = /home/kmcr/repos/hems/hemsmilsimulation