Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
up until now, the default
strategy
forgm repo branch fetch
has beennone
, which implies that, to have a proper "fetch strategy",--strategy <strat>
had to be used every time...however, in my Git config, i have
pull.rebase
set totrue
, which means i want to rebase most of the time.this PR makes it so that the default value of
strategy: string
is eitherrebase
whenpull.rebase
is set ormerge
when it's not.the "strategy" can always be
--strategy rebase
or--strategy merge
--strategy none