feat(git): auto stash on merge and rebase

2026-03-16 10:11:08 +01:00 · 2020-11-24 08:49:21 +01:00
parent 080439604b
commit f34a938968
1 changed files with 2 additions and 0 deletions
--- a/configs/git.nix
+++ b/configs/git.nix
@@ -76,6 +76,8 @@ in
      ignores = ignorePaths;
      extraConfig = {
        pull.ff = "only";
+        rebase.autoStash = true;
+        merge.autoStash = true;
        core.pager =
          "${pkgs.gitAndTools.diff-so-fancy}/bin/diff-so-fancy | ${pkgs.less}/bin/less --tabs=4 -RFX";
        color = {