diff --git a/home/git.nix b/home/git.nix index 177782f..c43b38d 100644 --- a/home/git.nix +++ b/home/git.nix @@ -58,8 +58,22 @@ in signByDefault = true; }; extraConfig = { - pull = { rebase = true; }; - rebase = { autoStash = true; }; + init = { + defaultBranch = "main"; + }; + pull = { + rebase = true; + }; + rebase = { + autoStash = true; + autoSquash = true; + abbreviateCommands = true; + missingCommitsCheck = "warn"; + }; + }; + aliases = { + mr = "!sh -c 'git fetch $1 merge-requests/$2/head:mr-$1-$2 && git checkout mr-$1-$2' -"; + pr = "!sh -c 'git fetch $1 refs/pull/$2/head:pr/$1 && git checkout pr/$2'"; }; includes = flatten (mapAttrsToList (name: profile: map (dir: { condition = "gitdir:${dir}";