Try this:
git init
echo foo > foo; git add foo; git commit -m foo
git checkout -b improvements master
echo bar > bar; git add bar; git commit -m bar
echo bar2 >> bar; git add bar; git commit -m bar2
git checkout master
git merge --no-commit improvements^
Updating fdf578b..83720c5
Fast-forward
bar | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
create mode 100644 bar
** Changed in: git (Ubuntu)
Status: Incomplete => New
--
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
[email protected]
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
