diff --git a/git/config b/git/config index eab9491..ddd0e5f 100644 --- a/git/config +++ b/git/config @@ -1,54 +1,54 @@ [alias] loggod = log --graph --no-show-signature --pretty=format:\"%C(auto)%h %G? %d %s%Creset\" branchv = branch --list -vv --all branchlv = branch --list -vv ctags = !.git/hooks/ctags fixes = show -s --pretty='format:Fixes: %h (\"%s\")' [user] useconfigonly = true name = Pierre Moreau [format] signoff = true [diff] tool = kitty.gui submodule = log colorMoved = zebra [diff "spirv"] textconv = spirv-dis [difftool] prompt = false trustExitCode = true [difftool "nvim"] cmd = nvim -f -c \"Gdiff\" \"$MERGED\" [difftool "kitty"] cmd = kitty +kitten diff $LOCAL $REMOTE [difftool "kitty.gui"] cmd = kitty kitty +kitten diff $LOCAL $REMOTE [merge] tool = nvim conflictstyle = diff3 [mergetool] prompt = false [mergetool "nvim"] cmd = nvim -f -c \"Gdiff\" \"$MERGED\" [push] - default = simple + default = upstream [status] submodulesummary = 1 [init] templatedir = ~/.config/git/template [rebase] autoSquash = true [sendemail] smtpencryption = ssl suppresscc = self signedoffbycc = true [log] showSignature = true [notes] rewriteRef = refs/notes/commits [pull] rebase = true [fetch] prune = true pruneTags = true