On a seconds thought, this is intended behavior as its a fast forward.
--no-commit --no-ff does what I wanted.
Sorry for wasting your time.
** Changed in: git (Ubuntu)
Status: New => Invalid
--
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
https://bugs.launchpad.net/bugs/947396
Title:
git merge doesn't always honor --no-commit
To manage notifications about this bug go to:
https://bugs.launchpad.net/ubuntu/+source/git/+bug/947396/+subscriptions
--
ubuntu-bugs mailing list
ubuntu-bugs@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
