Setting Up Git: Remove pull.rebase config step#30946
Merged
mao-sz merged 1 commit intoTheOdinProject:mainfrom Mar 28, 2026
Merged
Setting Up Git: Remove pull.rebase config step#30946mao-sz merged 1 commit intoTheOdinProject:mainfrom
pull.rebase config step#30946mao-sz merged 1 commit intoTheOdinProject:mainfrom
Conversation
As of Git v2.33.1, `git pull` will default to fast-forward with non-divergent branches. The warning message about not specifying a reconciliation method as an option or in the config now only shows up if pulling into a divergent branch, which would not be something intentionally done in TOP anyway.
github-actions
bot
added
the
Content: Foundations
rlmoser99
approved these changes
Mar 28, 2026
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
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.
Because
As of Git v2.33.1,
git pullwill default to fast-forward with non-divergent branches, with no warning message.The warning message about not specifying a reconciliation method as an option or in the config now only shows up if pulling into a divergent branch (rather than always), which would not be something intentionally done in TOP anyway (and we don't instruct to
git pullanywhere either. Any lessons about pulling instead use fetching and merging as separate steps to be explicit).See git/git@031e2f7
This PR
pull.rebasevalueIssue
Closes #30932
Pull Request Requirements
location of change: brief description of changeformat, e.g.Intro to HTML and CSS lesson: Fix link textBecausesection summarizes the reason for this PRThis PRsection has a bullet point list describing the changes in this PRIssuesection