Re: [PATCH 14/18] git notes merge: Manual conflict resolution, part 2/2

From: Johan Herland <johan@herland.net>
Date: Sep 29, 2010, 23:37 UTC
Message-ID: <201009300137.10291.johan@herland.net>
In-Reply-To: <AANLkTimzii1TEqRY40idz_i8qXHGFnoCZa29eH31U6n7@mail.gmail.com>

On Wednesday 29 September 2010, Ævar Arnfjörð Bjarmason wrote:

Show 8 quoted lines

> On Wed, Sep 29, 2010 at 00:23, Johan Herland <johan@herland.net> 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@herland.net>
www.herland.net