Stephen Touset <stephen@xxxxxxxxxx> wrote: > On Tue, 2007-06-05 at 15:42 +1200, Sam Vilain wrote: > > "git-svn dcommit" ends up making an arbitrary decision when pushing > > back merges. Allow the user to specify which one is used, albeit in a > > rather hack-ish way. > > I've been thinking about this. I'm rather new to git internals, but if > I've created a local copy of a remote branch (git-checkout -b > local-branch --track remote-branch), can't git-svn use the tracking > metadata to determine which part of the tree to dcommit to? Probably. --track didn't exist when "git-svn dcommit" was written and I didn't even know about it until now. Needless to say, not everybody uses or knows about it, but it would probably be a good option to add to git-svn. -- 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