Skip to content

New branch#11

Open
feefladder wants to merge 4 commits into
zegl:mainfrom
feefladder:new-branch
Open

New branch#11
feefladder wants to merge 4 commits into
zegl:mainfrom
feefladder:new-branch

Conversation

@feefladder

@feefladder feefladder commented Oct 6, 2023

Copy link
Copy Markdown

Fixes #8 by rebasing all merge-base commits. Not sure if it also works for very complex situations like

a-b-c-d-e-f
  \
   g-h-i
      \
       j-k

or

a-b-c-d-e-f
  \    /
   g-h-i

But it does work for testytest.sh, which creates

     g
    /
a-b-c-d
  \
   e-f

and becomes

     g
    /
0-1-2-3
  \
   e-f

Then running git-linearize from any other branch will just work!
Also not sure what happens if there
Sorry for not writing it all in the tests, I tried, but didn't really know how to use the bats files...

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.

Allow non-linearity

2 participants