[PATCH v4 0/2] merge-recursive: option to disable renames

From: Felipe Gonçalves Assis <felipeg.assis@gmail.com>
Date: Feb 17, 2016, 03:15 UTC
Message-ID: <1455678926-15105-1-git-send-email-felipegassis@gmail.com>

Incorporate documentation input from Eric Sunshine. Fix missing signoff.

The first part is unchanged.

No tests are included for now. This work is being done in parallel and should be properly included in future proposals.

Felipe Gonçalves Assis (2):
  merge-recursive: option to disable renames
  merge-recursive: more consistent interface

 Documentation/merge-strategies.txt | 12 ++++++++++--
 merge-recursive.c                  | 12 +++++++++++-
 merge-recursive.h                  |  1 +
 3 files changed, 22 insertions(+), 3 deletions(-)

-- 
2.7.1.289.ga0c045c