Hi, On Sun, 20 Jul 2008, Miklos Vajna wrote: > First, currently you can specify multiple strategies in the config > (pull.twohead, pull.octopus) using a space separated list. Oh, I did not mean to change that. I just misremembered. > Second, we could allow custom strategies, as we started to discuss here: > > http://thread.gmane.org/gmane.comp.version-control.git/86584/focus=87684 In my opinion, this would make it easier for interested parties to start implementing that blame-based merge strategy I mentioned. > Third, it would be nice to allow passing extra parameter(s) to the > backends, but I do not know what concept is the best here. The > strategy1=foo,stategy2=bar limits the input to a single string. Is that > enough? Given that recursive=theirs was considered harmful, we don't > have too much examples; for subtree the only parameter I could think of > is the path, so a string there is enough. > > However, further strategies, like blame, could take more parameters, > like git blame -C<num> -M<othernum>. Or do I just overcomplicate it? ;-) The common solution is like with gcc's -Wl option, which translates commata into spaces, like so: "-Wl,--machine,i386" is added as "--machine i386" to the linker command line. Our own cvsimport implements the same principle: $ git cvsimport -p -b,HEAD will only update the main branch. Ciao, Dscho -- 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
