search

pcottle / learnGitBranching

An interactive git visualization and tutorial. Aspiring students of git can use this app to educate and challenge themselves towards mastery of git!
https://pcottle.github.io/learnGitBranching/
MIT License
30.61k stars 5.75k forks source link

A rebase after an interactive rebase swaps the commits #976

Closed m-beelman closed 2 years ago

m-beelman commented 2 years ago

I first created a feature branch with two commits and swapped those two commits in order with an interactive rebase. Afterwards I wanted to perform a rebase on the main branch. After the rebase the (swapped) commits were in their original order.

These are the commands I used:

$ git checkout -b Feature
$ git commit
$ git checkout -
$ git commit
$ git checkout -
$ git commit
$ git rebase -i C1
$ git rebase main

Attached also the exported tree. rebase_rebase_issue.zip

I used the official https://learngitbranching.js.org/ website.

m-beelman commented 2 years ago

Already commented issue #977 is similar to this. I close the issue with a reference to that.