Heya, On Wed, Oct 20, 2010 at 21:08, Johan Herland <johan@xxxxxxxxxxx> 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 -- 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