Mercurial > dotfiles

comparison dot_gitconfig.tmpl @ 516:cf71ce0b06d3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Enable merge.nvim
author zegervdv <zegervdv@me.com>
date Fri, 31 Dec 2021 12:18:50 +0100
parents 41a48a26b0aa
children c8960ba7f019
comparison
equal deleted inserted replaced
515:67a4228c6532 516:cf71ce0b06d3
15 [gpg] 15 [gpg]
16 program = gpg 16 program = gpg
17 [merge] 17 [merge]
18 tool = splice 18 tool = splice
19 [mergetool "splice"] 19 [mergetool "splice"]
20 cmd = "nvim -f $BASE $LOCAL $REMOTE $MERGED -c 'SpliceInit'" 20 cmd = "nvim -f $BASE $LOCAL $REMOTE $MERGED -c 'MergeInit'"
21 trustExitCode = true 21 trustExitCode = true
22 [alias] 22 [alias]
23 ls = log --format=\"%C(auto)%h %<(15)%C(auto, green)%cr %>(20)%C(auto, magenta)%an %C(auto)%s %D\" 23 ls = log --format=\"%C(auto)%h %<(15)%C(auto, green)%cr %>(20)%C(auto, magenta)%an %C(auto)%s %D\"
24 tags = tag -l --sort creatordate --column 24 tags = tag -l --sort creatordate --column
25 [core] 25 [core]