Update git config based on LocalStack tips

simonrw · Jul 9, 2024 · 75829bd · 75829bd
1 parent 6078a9b
commit 75829bd
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/home/git/global.nix b/home/git/global.nix
@@ -1,5 +1,4 @@
 {
-  config,
   pkgs,
   isLinux,
   ...
@@ -18,7 +17,7 @@
       uc = "update-commit";
       graph = "log --graph --all --decorate --stat --date iso";
 
-      pushf = "push --force-with-lease";
+      pushf = "push --force-with-lease --force-if-includes";
 
       # reset $REVIEW_BASE to upstream
       sync = ''!f() { git fetch origin && git branch -f "$REVIEW_BASE" origin/"$REVIEW_BASE"; }; f'';
@@ -96,6 +95,7 @@
       "url \"[email protected]:\"" = {
         pushInsteadOf = "https://github.com";
       };
+      log.follow = true;
       branch = {
         autosetuprebase = "always";
         sort = "-committerdate";