Pull option fix #292
Merged
Pull option fix #292
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6ab14d9 (installer: allow configuring the default behavior of `git pull`, 2020-05-19) introduced radio buttons to select how `git pull` behaves by default. The `fast-forward only` option currently gets wrongly saved as `merge`, though. Signed-off-by: Matthias Aßhauer <mha1993@live.de>
Since Version 2.27.0 sometimes saved the wrong pull behaviour to /etc/install-options.txt, we can't quite trust the values in that file. The values in the system config file accurately represent the pull behaviour. Let's use those reliable records. Signed-off-by: Matthias Aßhauer <mha1993@live.de>
dscho
approved these changes
Jun 5, 2020
|
Thank you! |
dscho
added a commit
that referenced
this pull request
Jun 6, 2020
The new \`git pull\` behavior option [now records the \`fast-forward\` choice correctly](#292). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
We currently don't save the
fast-forward onlypull behaviour correctly.Let's fix that.
This fixes git-for-windows/git#2668