On Tue, Nov 4, 2008 at 11:04 PM, Andreas Ericsson <ae@xxxxxx> wrote: > Ah, right. Octopus merge always does merge head reduction, but to do > that it needs to find a common ancestor. When no such ancestor exists, > it will fail (with a message like "shouldn't be doing octopus merge"?). > > If there's no "--no-reduce-heads" option to "git merge", I think you're > screwed with getting that to happen in a single commit. :( > > Oh wait. > > git merge i1 && git merge --no-commit i2 && git commit --amend > > might work. I'm still shooting from the hip though, and now it's far too > late for me to think more. gl though. > it's late for me too! $ git merge i1/master Merge made by recursive. a | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 a $ git merge --no-commit i2/master Automatic merge went well; stopped before committing as requested $ git commit --amend fatal: You are in the middle of a merge -- cannot amend. note the merge can work, but it's still done in 2 steps. :( thanks for suggesting this. -- Christian -- http://detaolb.sourceforge.net/, a linux distribution for Qemu with Git inside ! -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
