search

eficode-academy / git-katas

A set of exercises for deliberate Git Practice
MIT License
1.32k stars 860 forks source link

Improve rebase exercise #192

Closed JKrag closed 5 years ago

JKrag commented 5 years ago

I was a bit tired of explaining that git rebase -i default behaviour didn't work in the exercise because there is no origin/master to go back to, so I fixed it. I figured there are other exercises that will need support for "remotes" so I made the improvement generalised by adding to the utils scripts.

This PR only contains the Shell scripts and changes to the reorder-the-history exercise. I have made similar additions to the Powershell scripts, but it seems they are still buggy (as testen in a Docker container on my mac), so I left them out of this PR.

RandomSort commented 5 years ago

This looks good. Thank you @JKrag . Good point that the exercise should not conflict with the default behaviour.