From: Elijah Newren <newren@gmail.com>
To: gitster@pobox.com
Cc: git@vger.kernel.org, sbeller@google.com,
Elijah Newren <newren@gmail.com>
Subject: [PATCH 0/3] Some small fixes to merge-recursive and tests
Date: Fri, 5 Jan 2018 12:19:58 -0800 [thread overview]
Message-ID: <20180105202001.24218-1-newren@gmail.com> (raw)
These three patches were the first three from
en/rename-directory-detection[1], but as Stefan suggested[2], I'm submitting
them separately as they are independent fixes.
Change from PATCHv5-rename-directory-detection:
* Split from the rest of the series.
* Added Stefan's Reviewed-By.
[1] https://public-inbox.org/git/20171228041352.27880-1-newren@gmail.com/
[2] https://public-inbox.org/git/CAGZ79kapuEKLO4RUUPVS6_-aeBERDhjpBAtmK=gycT8GaK2bFg@mail.gmail.com/
Elijah Newren (3):
Tighten and correct a few testcases for merging and cherry-picking
merge-recursive: fix logic ordering issue
merge-recursive: add explanation for src_entry and dst_entry
merge-recursive.c | 21 ++++++++++++++++++++-
t/t3501-revert-cherry-pick.sh | 7 +++++--
t/t7607-merge-overwrite.sh | 5 ++++-
3 files changed, 29 insertions(+), 4 deletions(-)
--
2.14.2
next reply other threads:[~2018-01-05 20:21 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-05 20:19 Elijah Newren [this message]
2018-01-05 20:19 ` [PATCH 1/3] Tighten and correct a few testcases for merging and cherry-picking Elijah Newren
2018-01-05 21:24 ` Johannes Schindelin
2018-01-05 20:20 ` [PATCH 2/3] merge-recursive: fix logic ordering issue Elijah Newren
2018-01-05 21:22 ` Johannes Schindelin
2018-01-05 20:20 ` [PATCH 3/3] merge-recursive: add explanation for src_entry and dst_entry Elijah Newren
2018-01-05 21:26 ` Johannes Schindelin
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=20180105202001.24218-1-newren@gmail.com \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sbeller@google.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.