Add note: how to set the pull.rebase variable #1461
Merged
Conversation
This file contains hidden or 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
From version 2.27 onward, git will give a warning when the pull.rebase variable is not set. This commit adds a note detailing how to configure the pull.rebase variable to get rid of this warning.
ben
reviewed
Jul 15, 2020
Co-authored-by: Ben Straub <[email protected]>
Contributor
Author
|
I've made the changes you wanted, I could just do that right from the GitHub interface, that was easy! 😄 |
Member
|
Yeah that feature is pretty great. Thanks! |
Contributor
Author
|
Thanks for merging it in! 👍 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
From git version 2.27 onward
git pullwill give a warning if the pull.rebase variable is not set.You can stop git complaining on every pull by setting the variable.
This pull-request adds a note with help on how to set the variable.
This new behavior for git is documented in the release notes for git 2.27:
https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.27.0.txt
I checked the book for the first occurrence of
git pulland put the note there.If there's a better place for the note, please say so, and I'll move the note to that place instead. 😄