about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFranck Cuny <franck@fcuny.net>2022-06-20 14:37:52 -0700
committerFranck Cuny <franck@fcuny.net>2022-06-20 14:41:58 -0700
commitf77fd5e915479f630faa2698d300f2cd8eadd9bd (patch)
treec68f419f4f12a77b26011e95cfc8a5e6d6b12bd2
parentfeat(home/git): add a few more options in the default configuration (diff)
downloadworld-f77fd5e915479f630faa2698d300f2cd8eadd9bd.tar.gz
doc(home/git): comment some of the options
Change-Id: I7c898923c423a30cbc5ba8ba79fb8b9e8e4d2d21
Reviewed-on: https://cl.fcuny.net/c/world/+/461
Reviewed-by: Franck Cuny <franck@fcuny.net>
Tested-by: CI
-rw-r--r--home/git/default.nix4
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";