Ramkumar Ramachandra wrote: > In the same spirit as ".git/sequencer/head" and ".git/sequencer/todo", > introduce ".git/sequencer/opts" to persist the replay_opts structure > for continuing after a conflict resolution. Use the gitconfig format > for this file so that it looks like: > > [core] > signoff = true > record-origin = true > mainline = 1 > strategy = recursive > strategy-option = patience > strategy-option = ours Maybe "[options]" instead of "[core]" would be more self-explanatory. If this is meant to be closely analagous to the gitconfig file, then variable names should not contain dashes. It would be nice if some day the config parser could learn to treat dashes as insignificant, just like it already treats case distinctions as insignificant. -- 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