From: "Felipe Gonçalves Assis" <felipeg.assis@gmail.com>
To: git@vger.kernel.org
Cc: Johannes.Schindelin@gmx.de, gitster@pobox.com,
sunshine@sunshineco.com,
"Felipe Gonçalves Assis" <felipegassis@gmail.com>
Subject: [PATCH v4 0/2] merge-recursive: option to disable renames
Date: Wed, 17 Feb 2016 01:15:24 -0200 [thread overview]
Message-ID: <1455678926-15105-1-git-send-email-felipegassis@gmail.com> (raw)
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
next reply other threads:[~2016-02-17 3:17 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-17 3:15 Felipe Gonçalves Assis [this message]
2016-02-17 3:15 ` [PATCH v4 1/2] merge-recursive: option to disable renames Felipe Gonçalves Assis
2016-02-17 3:15 ` [PATCH v4 2/2] merge-recursive: more consistent interface Felipe Gonçalves Assis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1455678926-15105-1-git-send-email-felipegassis@gmail.com \
--to=felipeg.assis@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=felipegassis@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).