From: Eugeniu Rosca <erosca@de.adit-jv.com>
To: <git@vger.kernel.org>
Cc: <linux-kernel@vger.kernel.org>,
Greg KH <gregkh@linuxfoundation.org>,
Felipe Balbi <balbi@kernel.org>,
Eugeniu Rosca <erosca@de.adit-jv.com>,
Eugeniu Rosca <roscaeugeniu@gmail.com>
Subject: Signal conflict on merging metadata-differing patches
Date: Mon, 18 Nov 2019 18:29:17 +0100 [thread overview]
Message-ID: <20191118172917.GA6063@vmlxhi-102.adit-jv.com> (raw)
Dear Git community,
Due to high inflow of patches which Linux maintainers carry on their
shoulders and due to occasionally intricate relationships between
consecutive revisions of the same series, it may [1] happen that two
distinct revisions of the same patch (differing only/mostly in
metadata, e.g. Author's time-stamp and commit description) may end up
being merged on the same branch, without git to complain about that.
Is there any "git merge" flag available off-the-shelf which (if used)
would signal such situations?
[1] https://patchwork.kernel.org/patch/11135107/#23007101
--
Best Regards,
Eugeniu
next reply other threads:[~2019-11-18 17:29 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-18 17:29 Eugeniu Rosca [this message]
2019-11-18 17:35 ` Greg KH
2019-11-18 18:45 ` Eugeniu Rosca
2019-11-18 19:48 ` Greg KH
2019-11-19 2:04 ` Junio C Hamano
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=20191118172917.GA6063@vmlxhi-102.adit-jv.com \
--to=erosca@de.adit-jv.com \
--cc=balbi@kernel.org \
--cc=git@vger.kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=roscaeugeniu@gmail.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
all inboxes | Powered by JetHome®