added git option to always rebase on pull.

This commit is contained in:
Gabe Venberg 2025-04-28 13:07:36 +02:00
parent 031e1b1b34
commit 9054a520b0

View file

@ -60,7 +60,10 @@
pruneTags = true;
all = true;
};
pull.ff = true;
pull = {
ff = true;
rebase = "merges";
};
merge.conflictstyle = "zdiff3";
diff = {
algorithm = "histogram";