From 44db74317636f6de3b3cf21b37b9d786845995fc Mon Sep 17 00:00:00 2001 From: Dmitry Voronin Date: Wed, 18 Dec 2024 07:32:27 +0300 Subject: [PATCH] Git: Use patience for on-screen diffs, minimal for patches and histogram as a default. --- home/file/git/default.nix | 1 + home/program/bash/module/Git.nix | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/home/file/git/default.nix b/home/file/git/default.nix index b09d8dfe..816d5998 100644 --- a/home/file/git/default.nix +++ b/home/file/git/default.nix @@ -12,5 +12,6 @@ rebase.autoStash = true; safe.directory = "*"; user.signingkey = builtins.readFile secret.crypto.sign.git.key; + diff.algorithm = "histogram"; }; } diff --git a/home/program/bash/module/Git.nix b/home/program/bash/module/Git.nix index 231b5a69..903c3475 100644 --- a/home/program/bash/module/Git.nix +++ b/home/program/bash/module/Git.nix @@ -48,12 +48,12 @@ # Git diff. function gd() { - git diff "''${@}" + git diff --patience "''${@}" } # Git diff added. function gda() { - git diff --cached "''${@}" + git diff --cached --patience "''${@}" } # Git commit.