On Thu, Apr 08, 2021 at 11:37:36PM +0200, SZEDER Gábor wrote: > On Thu, Apr 08, 2021 at 01:56:02AM +0300, Sergey Organov wrote: > > New log.diffMerges configuration variable sets the format that > > --diff-merges=def will be using. The default is "separate". > > > > Signed-off-by: Sergey Organov <sorganov@xxxxxxxxx> > > --- > > builtin/log.c | 2 ++ > > diff-merges.c | 11 +++++++++++ > > diff-merges.h | 2 ++ > > 3 files changed, 15 insertions(+) > > Please don't forget to document this new configuration variable. Oh, just noticed that you do document it in the last patch of the series, and, similarly, you add new options early in this patch series and add the corresponding documentation in the second to last patch. Please squash in those documentation updates into the corresponding patches.
