I can’t reproduce this.
$ dpkg-query -W git
git 1:1.7.5.4-1
$ git init
Initialized empty Git repository in /tmp/foo/.git/
$ echo foo > foo; git add foo; git commit -m foo
[master (root-commit) 15c6097] foo
1 files changed, 1 insertions(+), 0 deletions(-)
create mode 100644 foo
$ echo foo >> foo; git add foo; git commit -m foo
[master 2702307] foo
1 files changed, 1 insertions(+), 0 deletions(-)
$ git checkout -b improvements master^
Switched to a new branch 'improvements'
$ echo bar > bar; git add bar; git commit -m bar
[improvements e503243] bar
1 files changed, 1 insertions(+), 0 deletions(-)
create mode 100644 bar
$ echo bar >> bar; git add bar; git commit -m bar
[improvements 9903df5] bar
1 files changed, 1 insertions(+), 0 deletions(-)
$ git checkout master
Switched to branch 'master'
$ git merge --no-commit improvements^
Automatic merge went well; stopped before committing as requested
If you can reproduce this, can you show some commands that demonstrate
the problem?
** Changed in: git (Ubuntu)
Status: New => Incomplete
--
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
