This commit is contained in:
Jana Dönszelmann 2026-03-19 10:24:29 +01:00
parent 194cefe340
commit ac7e310e00
No known key found for this signature in database
9 changed files with 181 additions and 111 deletions

View file

@ -13,12 +13,12 @@ inputs@{ machine, ... }:
settings = {
user = {
email = config.programs.git.settings.user.email;
name = config.programs.git.settings.user.name;
inherit (config.programs.git.settings.user) email;
inherit (config.programs.git.settings.user) name;
};
ui = {
paginate = "never";
# paginate = "never";
# pager = "${pkgs.delta}/bin/delta";
# for delta
# diff-formatter = ":git";
@ -32,7 +32,6 @@ inputs@{ machine, ... }:
default-command = [
"log"
"--reversed"
"--no-pager"
];
merge-editor = [
"${pkgs.meld}/bin/meld"
@ -154,14 +153,26 @@ inputs@{ machine, ... }:
"--from"
"trunk()"
];
n = [ "edit" "@+" ];
p = [ "edit" "@-" ];
n = [
"edit"
"@+"
];
p = [
"edit"
"@-"
];
gp = [ "git" "push" ];
gp = [
"git"
"push"
];
t = tug;
d = "describe";
dm = [ "describe" "-m" ];
dm = [
"describe"
"-m"
];
e = "edit";
s = "squash";
si = "squash -i";