Re: [PATCH] git-rebase--merge: don't include absent parent as a base

It's helpful in the case where a bit of code has been detached from its history by way of copying the files and starting a new repo, where development continues. If you want to reunite the new history with the prior history, while preferring the new history, you need to `rebase -Xtheirs` the new br

Re: [PATCH] git-rebase--merge: don't include absent parent as a base

Ben Woosley writes: > From: Ben Woosley > > Absent this fix, attempts to rebase an orphan branch with --strategy recursive > will fail with: > > $ git rebase ORPHAN_TARGET_BASE -s recursive > First, rewinding head to replay your work on top of it... > fatal: Could not parse object 'O

[PATCH] git-rebase--merge: don't include absent parent as a base

From: Ben Woosley Absent this fix, attempts to rebase an orphan branch with --strategy recursive will fail with: $ git rebase ORPHAN_TARGET_BASE -s recursive First, rewinding head to replay your work on top of it... fatal: Could not parse object 'ORPHAN_ROOT_SHA^' Unknown exit co