On Fri, Aug 14, 2015 at 3:11 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Jacob Keller <jacob.e.keller@xxxxxxxxx> writes: > >> diff --git a/Documentation/config.txt b/Documentation/config.txt >> index 75ec02e8e90a..de67ad1fdedf 100644 >> --- a/Documentation/config.txt >> +++ b/Documentation/config.txt >> @@ -1947,8 +1947,8 @@ notes.rewriteMode:: >> When copying notes during a rewrite (see the >> "notes.rewrite.<command>" option), determines what to do if >> the target commit already has a note. Must be one of >> - `overwrite`, `concatenate`, or `ignore`. Defaults to >> - `concatenate`. >> + `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. >> + Defaults to `concatenate`. >> + >> This setting can be overridden with the `GIT_NOTES_REWRITE_MODE` >> environment variable. >> diff --git a/Documentation/git-notes.txt b/Documentation/git-notes.txt >> index 851518d531b5..674682b34b83 100644 >> --- a/Documentation/git-notes.txt >> +++ b/Documentation/git-notes.txt >> @@ -331,7 +331,8 @@ environment variable. >> notes.rewriteMode:: >> When copying notes during a rewrite, what to do if the target >> commit already has a note. Must be one of `overwrite`, >> - `concatenate`, and `ignore`. Defaults to `concatenate`. >> + `concatenate`, `cat_sort_uniq`, or `ignore`. Defaults to >> + `concatenate`. >> + >> This setting can be overridden with the `GIT_NOTES_REWRITE_MODE` >> environment variable. > > This obviously is not a problem introduced by this patch, but I > wonder why we have two similar but different set of modes for > rewrtie and merge. Isn't 'overwrite' like 'ours', 'ignore' like > 'theirs', and 'concat' like 'union', and if these are similar > enough, perhaps it would be helpful to the end user if we unified > the terms (or accepted both as synonyms for backward compatibility)? > > Also I notice that you cannot manually reconcile while rewriting; > don't we want to have 'manual' there, too, I wonder? > > [jc: Cc'ed Thomas who invented rewrite back when merge was not even > there, and Johan who added merge] > I was not sure. I believe that re-write doesn't do the same thing as merge? I think we could make all of them handle the "overwrite", which is basically a synonym of, I think "theirs" depending on the direction of the "merge". I don't know if re-write actually supports manual mode at all! Maybe we could make merge support the other names as synonyms, and then code re-write in terms of merging? I wasn't sure so I chose only to document the mode that was missing. Regards, Jake -- 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