all repos — nixfiles @ 15cee80b0f179ed08fffe0b41976a2749cab363a

System and user configuration, managed by nix and home-manager

Git: add "difftool" command (requires icdiff)

Alan Pearce
commit

15cee80b0f179ed08fffe0b41976a2749cab363a

parent

da106a2392ebebb3cefb425d3f3ba9285a5e647d

1 file changed, 6 insertions(+), 0 deletions(-)

jump to
M git/.config/git/configgit/.config/git/config
@@ -32,3 +32,9 @@ [rebase]
autosquash = true [rerere] enabled = true +[diff] + tool = icdiff +[difftool] + prompt = false +[difftool "icdiff"] + cmd = icdiff --line-numbers $LOCAL $REMOTE