Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New branch #11

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

New branch #11

wants to merge 4 commits into from

Conversation

feefladder
Copy link
Contributor

@feefladder feefladder commented Oct 6, 2023

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
1 participant