update before update
This commit is contained in:
parent
ebac260b64
commit
dee2a92cf1
3 changed files with 12 additions and 3 deletions
|
|
@ -10,6 +10,11 @@ _: {
|
|||
delta.options = {
|
||||
navigate = true;
|
||||
light = false;
|
||||
side-by-side = true;
|
||||
features = "decorations interactive";
|
||||
interactive = {
|
||||
keep-plus-minus-markers = false;
|
||||
};
|
||||
};
|
||||
|
||||
extraConfig = {
|
||||
|
|
@ -17,9 +22,10 @@ _: {
|
|||
pull.rebase = true;
|
||||
init.defaultBranch = "main";
|
||||
gpg.format = "ssh";
|
||||
diff.colorMoved = true;
|
||||
diff.colorMoved = "default";
|
||||
rerere.enabled = true;
|
||||
|
||||
alias.conflicts = "diff --check";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue