Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use a default "fetch" strategy #195

Merged
merged 4 commits into from
Apr 28, 2024
Merged

use a default "fetch" strategy #195

merged 4 commits into from
Apr 28, 2024

Conversation

amtoine
Copy link
Owner

@amtoine amtoine commented Apr 27, 2024

up until now, the default strategy for gm repo branch fetch has been none, 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 to true, which means i want to rebase most of the time.

this PR makes it so that the default value of strategy: string is either rebase when pull.rebase is set or merge when it's not.

the "strategy" can always be

  • overwritten with --strategy rebase or --strategy merge
  • disabled with --strategy none

@amtoine amtoine added the sugar Related to the `nu-git-manager-sugar` module label Apr 27, 2024
@amtoine amtoine merged commit 6cdfe07 into main Apr 28, 2024
5 checks passed
@amtoine amtoine deleted the default-fetch-strategy branch April 28, 2024 11:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
sugar Related to the `nu-git-manager-sugar` module
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant