On 9/17/07, Chris Shoemaker <c.shoemaker@xxxxxxx> wrote: > On Mon, Sep 17, 2007 at 04:12:56PM +0200, Lars Hjemli wrote: > > On 9/17/07, Johannes Schindelin <Johannes.Schindelin@xxxxxx> wrote: > > > But then, I do not use svn branches here, and that might be the problem? > > > > Probably. The case I'm trying to solve is: > > -git-svn branch A is merged into git-svn branch B > > -A is a fast-forward of B > > Ah, now I see what you mean. But, IIUC, if you want to dcommit your > merge, you should treat it the way svn treats it, with git-merge > --squash. Then, dcommit won't be confused about the branch you're > committing to. Yeah, --squash is a viable option (I _almost_ used it ;-) but I wanted to keep the merge-history on the git side (without modifying the grafts-file). -- larsh - 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
