feat(git): more configuration

This commit is contained in:
Oliver Davies 2022-09-21 17:08:50 +01:00
parent b0fdd2429d
commit dd7f3f0d95

View file

@ -72,6 +72,40 @@
wip = "!git add . && git commit -m 'wip'";
worktrees = "worktree list";
};
extraConfig = {
branch = {
autosetupmerge = true;
autosetuprebase = "always";
};
checkout.defaultRemote = "origin";
color.ui = true;
commit = {
template = "~/.gitmessage";
verbose = true;
};
core = {
editor = "nvim";
excludesFile = "~/.gitignore-global";
pager = "delta";
};
delta.line-numbers = true;
diff.tool = "vimdiff";
fetch.prune = true;
grep.lineNumber = true;
help.autocorrect = "1";
init.templatedir = "~/.git_template";
merge.ff = "only";
rebase = {
autosquash = true;
autostash = true;
};
push.default = "upstream";
pull = {
ff = "only";
rebase = true;
};
};
};
programs.tmux = {