Compare commits

...

2 commits

Author SHA1 Message Date
Trolli Schmittlauch 67904896a2 git: push --force-if-includes as default
stronger protection against accidentally overwriting remote commits by
another user, especially in the face of auto-fetching git clients.
2025-01-16 22:12:48 +01:00
Trolli Schmittlauch ba88e46046 lazygit: config via home-manager 2025-01-16 22:11:50 +01:00
2 changed files with 11 additions and 1 deletions

View file

@ -44,6 +44,7 @@
extraConfig = {
credential.helper = "cache";
push.default = "simple";
push.forceIfIncludes = true; # avoid accidental force overrides when remote is autofetched in background
init.defaultBranch = "mainline";
diff.tool = "vimdiff";
merge.tool = "vimdiff";
@ -75,6 +76,16 @@
};
};
};
programs.lazygit = {
enable = true;
settings = {
git = {
autoFetch = false;
mainBranches = ["main" "master" "mainline"];
};
update.method = "never";
};
};
# shell config
programs.zsh = {

View file

@ -106,7 +106,6 @@ let
ripgrep
fd
gitui
lazygit
pre-commit
scriv