Compare commits
2 commits
e2467646d8
...
67904896a2
Author | SHA1 | Date | |
---|---|---|---|
|
67904896a2 | ||
|
ba88e46046 |
|
@ -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 = {
|
||||
|
|
|
@ -106,7 +106,6 @@ let
|
|||
ripgrep
|
||||
fd
|
||||
gitui
|
||||
lazygit
|
||||
pre-commit
|
||||
scriv
|
||||
|
||||
|
|
Loading…
Reference in a new issue