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.

Sign up for GitHub

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

Feature/fix regex and unrelated histories #3

Merged

leonardaustin merged 2 commits into hraban:master from Kadrian:feature/fix-regex-and-unrelated-histories

Dec 20, 2016

Contributor

Kadrian commented Dec 20, 2016

Hey, this PR changes two things:

it adds support for branches including slashes, like feature/bar or bugfix/foo
it adds the flag --allow-unrelated-histories that is needed since git 2.9 (see http://stackoverflow.com/questions/37937984/git-refusing-to-merge-unrelated-histories)

Kadrian added 2 commits

December 20, 2016 12:12


Support branch names that contain slashes

908ea4f


Fix 'allow unrelated histories'

leonardaustin merged commit c82a8d6 into hraban:master

leonardaustin commented Dec 20, 2016

@Kadrian Cheers! Frohe Weihnachten!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment