added git option to always rebase on pull.
This commit is contained in:
parent
031e1b1b34
commit
9054a520b0
1 changed files with 4 additions and 1 deletions
|
@ -60,7 +60,10 @@
|
|||
pruneTags = true;
|
||||
all = true;
|
||||
};
|
||||
pull.ff = true;
|
||||
pull = {
|
||||
ff = true;
|
||||
rebase = "merges";
|
||||
};
|
||||
merge.conflictstyle = "zdiff3";
|
||||
diff = {
|
||||
algorithm = "histogram";
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue