Re: [PATCH v7 1/4] notes: document cat_sort_uniq rewriteMode

2015-08-15 Thread Johan Herland
On Sat, Aug 15, 2015 at 12:53 AM, Jacob Keller jacob.kel...@gmail.com wrote: On Fri, Aug 14, 2015 at 3:11 PM, Junio C Hamano gits...@pobox.com wrote: Jacob Keller jacob.e.kel...@intel.com writes: diff --git a/Documentation/config.txt b/Documentation/config.txt index 75ec02e8e90a..de67ad1fdedf

[PATCH v7 1/4] notes: document cat_sort_uniq rewriteMode

2015-08-14 Thread Jacob Keller
From: Jacob Keller jacob.kel...@gmail.com Teach documentation about the cat_sort_uniq rewriteMode that got added at the same time as the equivalent merge strategy. Signed-off-by: Jacob Keller jacob.kel...@gmail.com --- Documentation/config.txt| 4 ++-- Documentation/git-notes.txt | 3 ++- 2

Re: [PATCH v7 1/4] notes: document cat_sort_uniq rewriteMode

2015-08-14 Thread Junio C Hamano
Jacob Keller jacob.e.kel...@intel.com 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

Re: [PATCH v7 1/4] notes: document cat_sort_uniq rewriteMode

2015-08-14 Thread Jacob Keller
On Fri, Aug 14, 2015 at 3:11 PM, Junio C Hamano gits...@pobox.com wrote: Jacob Keller jacob.e.kel...@intel.com writes: diff --git a/Documentation/config.txt b/Documentation/config.txt index 75ec02e8e90a..de67ad1fdedf 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@