Repository navigation
fix: update-branch rebase doesn't work - #212
Merged
Merged
Conversation
The alias's mode check used over-escaped quotes ('\\"$1\\"'), which
survived git's config round-trip as literal backslash-quote tokens.
The shell therefore compared '\\rebase' to 'rebase' (never equal), so
'git update-branch rebase' always fell back to merge. Use plain quotes,
which git and the shell both handle correctly.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
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
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 fixes the
update-branchalias that gimmegit inserts. The alias has been broken since #166, after a change in downstream config writing.update-branch rebasewould actually do a merge.After this fix,
update-branch rebasewill work correctly in new clones, but will continue to be broken in clones created with gimmegit 3.0.3 through 4.0.0.