Re: [PATCHv4 00/21] git notes merge

Heya,

On Wed, Oct 20, 2010 at 21:08, Johan Herland [off-list ref] wrote:

- Sverre Rabbelier suggests renaming 'git notes merge --reset' to
 'git notes merge --abort'. I sort of agree, but would want some
 consistency with 'git merge', e.g. by providing 'git merge --abort'
 as an alias to 'git reset --merge'.

Can someone comment on whether "git reset --merge" is a good
implementation of "git merge --abort"? If we can get an Ack from
someone I'd love to see this implemented.

- When resolving notes merge conflicts, you can add/remove files/notes
 in .git/NOTES_MERGE_WORKTREE; 'git notes merge --commit' does not
 check that the notes have any relationship to the notes originally
 put there by 'git notes merge'. Should we warn about removed and
 added notes in .git/NOTES_MERGE_WORKTREE? Currently we don't, and
 I'm not sure it's worth it. Users can always review the merge commit
 afterwards.

If it's easy to do, it would be useful.

- Fetching and pushing note refs:
 - Add refs/notes/* to default fetch refspec?
 - A way to specify (at clone time) which refspec(s) to set up?
 - A way for the remote repo to hint at which refspecs you might want
   to set up (by default?)

Didn't we already discuss this earlier? Can you summarize (or at least
link to) that discussion?

-- 
Cheers,

Sverre Rabbelier