Lars Hjemli <hjemli@xxxxxxxxx> wrote: > This makes git-svn unconditionally invoke git-log with --first-parent when > it is trying to discover its upstream subversion branch and collecting the > commit ids which should be pushed to it with dcommit. The reason for always > using --first-parent is to make git-svn behave in a predictable way when the > ancestry chain contains merges with other git-svn branches. > > Since git-svn now always uses 'git-log --first-parent' there is no longer > any need for the --first-parent option to git-svn, so this is removed. > > Signed-off-by: Lars Hjemli <hjemli@xxxxxxxxx> > --- > > I'd like to add a '--upstream <revspec>' option, just for completeness, but > that will also require a new test script and now it's way past my bedtime. Sure thing. We can work on getting --upstream another time, but for now this is probably the best way to allow merges to work with git-svn. Acked-by: Eric Wong <normalperson@xxxxxxxx> -- Eric Wong - 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
