On Wednesday 29 September 2010, Ãvar ArnfjÃrà Bjarmason wrote: > On Wed, Sep 29, 2010 at 00:23, Johan Herland <johan@xxxxxxxxxxx> wrote: > > +--commit:: > > + Finalize an in-progress 'git notes merge', i.e. a notes merge > > with + conflicts. When 'git notes merge' encounters conflicts, > > it s + which returned one or more conflicts (that you have now > > resolved) > > This "it s ..." sentence doesn't make sense. Indeed. Will be fixed in the next iteration. Here's the updated text: --commit:: Finalize an in-progress 'git notes merge'. Use this option when you have resolved the conflicts that 'git notes merge' stored in .git/NOTES_MERGE_WORKTREE. This amends the partial merge commit created by 'git notes merge' (stored in .git/NOTES_MERGE_PARTIAL) by adding the notes in .git/NOTES_MERGE_WORKTREE. The notes ref stored in the .git/NOTES_MERGE_REF symref is updated to the resulting commit. ...Johan -- Johan Herland, <johan@xxxxxxxxxxx> www.herland.net -- 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