On Wed, Dec 1, 2010 at 11:05 AM, Jonathan Nieder <jrnieder@xxxxxxxxx> wrote: > I somewhat like this idea. So let's build a full table, shall > we? The embedded dashes are meant for the command-line options > rather than the config file. The suggested expansions sound good to me, with one comment: > -o mainline I am not sure about this one. The 'o' originally stood for 'origin' branch (back when git didn't use 'origin/master', or maybe I was stuck with Cogito's mental model). It is the branchname for CVS HEAD; it defaults to 'origin' -- given today's conventions it should be 'master'. I would call it cvshead. m -- martin.langhoff@xxxxxxxxx martin@xxxxxxxxxx -- School Server Architect - ask interesting questions - don't get distracted with shiny stuff - working code first - http://wiki.laptop.org/go/User:Martinlanghoff -- 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