diff options
| -rw-r--r-- | base/gitconfig | 3 | ||||
| -rw-r--r-- | default.nix | 13 |
2 files changed, 1 insertions, 15 deletions
diff --git a/base/gitconfig b/base/gitconfig index 8732a4d..eb1ca38 100644 --- a/base/gitconfig +++ b/base/gitconfig @@ -1,9 +1,6 @@ [include] path = custom -[diff] - external = "difft --display inline" - [push] default = simple diff --git a/default.nix b/default.nix index 921d775..9da4a9f 100644 --- a/default.nix +++ b/default.nix @@ -44,17 +44,7 @@ in rec { gitWrapped = pkgs.writeShellScript "git" '' export XDG_CONFIG_HOME=${gitConfig} - bin="${pkgs.git}/bin/git" - - # Overwrite show an log sub-commands to always set --ext-diff. git aliases - # don't allow for overwritting sub-commands, or I'd use them instead. - if [ "$1" = "show" ] || [ "$1" = "log" ]; then - subCmd="$1" - shift - exec "$bin" "$subCmd" --ext-diff "$@" - fi - - exec "$bin" "$@" + exec ${pkgs.git}/bin/git "$@" ''; git = pkgs.runCommand "mediocregopher-git" {} '' @@ -93,7 +83,6 @@ in rec { pkgs.less pkgs.tmux pkgs.calc - pkgs.difftastic pkgs.units pkgs.man |