On Fri, Jul 18, 2008 at 06:20:10PM +0900, Nanako Shiraishi wrote: > I do not know if "I do not understand what they did well enough" is the only reason people would want to use that feature. Isn't it better to let people decide that for themselves? It is dangerous to introduce new options just because we think someone, sometimes might find it useful, especially if they potentially encourage a bad workflow. Adding options and commands is expensive since it complicates the UI further, thus we should add further only when we have good reason for it. > > That also was the reason I did not add any documentation to it. I was actually looking for something like this based on some question on #git (about git pull -s theirs possibility), and did stumble upon these patches, but quickly gave up on them since it wasn't immediately clear for me from the patch description exactly how the workflow looks like (it doesn't really seem to work like the opposite of -s ours nor is it a separate strategy... huh) and the options were completely undocumented. -- Petr "Pasky" Baudis GNU, n. An animal of South Africa, which in its domesticated state resembles a horse, a buffalo and a stag. In its wild condition it is something like a thunderbolt, an earthquake and a cyclone. -- A. Pierce -- 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
