docs: add guide for choosing default git pull behavior#92
Merged
Conversation
The installer prompts users to choose a default git pull behavior, which can be confusing. This page explains the differences between merge, rebase, and fast-forward strategies to help users make an informed decision during setup and easily reconfigure it later. Signed-off-by: Jason Zbakh <jzbakh@gmail.com>
dscho
approved these changes
Jun 18, 2026
dscho
left a comment
dscho
left a comment
Member
There was a problem hiding this comment.
Very nice!
For the diagrams, we might want to imitate the sister website's gitgitgadget/gitgitgadget.github.io#25, which introduces support for complex, visually pleasing diagrams other than via ASCII art.
Member
|
I merged this PR as a prerequisite for merging git-for-windows/build-extra#682. |
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.
This PR introduces a new documentation page to explain the
git pullconfiguration options presented during the Git for Windows installation. This guide aims to clarify:git pullworks behind the scenes (fetch + integrate).git configwithout reinstalling.This should help users make a more informed decision during setup.