git: add some interesting settings
Alan Pearce alan@alanpearce.eu
Mon, 08 Jul 2024 14:33:05 +0200
1 files changed, 9 insertions(+), 2 deletions(-)
jump to
M user/settings/git.nix → user/settings/git.nix
@@ -32,21 +32,27 @@ }; pull = { rebase = true; }; + fetch = { + prune = true; + prunetags = true; + }; push = { default = "current"; + autoSetupRemote = true; followTags = true; }; rebase = { autosquash = true; + updateRefs = true; }; rerere = { - enable = true; + enabled = true; }; merge = { conflictStyle = "diff3"; }; diff = { - algorithm = "patience"; + algorithm = "histogram"; colorMoved = "default"; }; remote = { @@ -58,6 +64,7 @@ }; "branch.main" = { rebase = false; }; + "url.git@github.com:".insteadOf = "https://github.com/"; }; signing = { key = "0xCD4BEB92A8D46583";