Skip to content

fix: update-branch rebase doesn't work - #212

Merged
dwilding merged 1 commit into
mainfrom
fix-rebase
Oct 29, 2026
Merged

dwilding merged 1 commit into
mainfrom
fix-rebase

Conversation

@dwilding

@dwilding dwilding commented Oct 29, 2026 •

Copy link
Copy Markdown
Owner

This PR fixes the update-branch alias that gimmegit inserts. The alias has been broken since #166, after a change in downstream config writing. update-branch rebase would actually do a merge.

After this fix, update-branch rebase will work correctly in new clones, but will continue to be broken in clones created with gimmegit 3.0.3 through 4.0.0.

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>
@dwilding
dwilding merged commit b7caf6f into main Oct 29, 2026
15 checks passed
@dwilding
dwilding deleted the fix-rebase branch October 29, 2026 13:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant