diff options
Diffstat (limited to 'home/git/default.nix')
| -rw-r--r-- | home/git/default.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/home/git/default.nix b/home/git/default.nix index 8188884..7ec9dcc 100644 --- a/home/git/default.nix +++ b/home/git/default.nix @@ -18,11 +18,15 @@ in extraConfig = { core.whitespace = "trailing-space,space-before-tab"; color.ui = "true"; + # abort if the remote branch does not match the local one push.default = "simple"; init.defaultBranch = "main"; pull.rebase = true; rebase = { + # Automatically create a temporary stash entry before the + # operation begins, and apply it after the operation ends. autoStash = true; + # Print a warning if some commits are removed missingCommitsCheck = "warn"; }; branch.autosetuprebase = "remote"; |