From: Linus Torvalds <torvalds@linux-foundation.org>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: "Jason A. Donenfeld" <Jason@zx2c4.com>,
linux-mm@kvack.org, mm-commits@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [GIT PULL] non-MM commits for 6.2-rc1
Date: Mon, 12 Dec 2022 15:33:02 -0800 [thread overview]
Message-ID: <CAHk-=wisHBccs=VyL5DBUOmd2pge4OM6An9T600B4rmgnX5mNg@mail.gmail.com> (raw)
In-Reply-To: <20221212142754.5f699c4ff515fd9d42768fb2@linux-foundation.org>
On Mon, Dec 12, 2022 at 2:27 PM Andrew Morton <akpm@linux-foundation.org> wrote:
>
> Is there some way of telling git to complain about identical changes
> when doing a trial merge?
No, the merge functionality of git literally doesn't care about
individual commits.
(git does walk the commit chain as part of finding the common
ancestor, but apart from that, very fundamentally merging in git is
*not* about merging individual commits at any point. None of the darcs
"patch algebra" nonsense).
But as Vlastimil pointed out, git does have various log-based models
for finding identical patches based on the patch ID.
Those are intentionally not used for merging, but for the various
"move patches around" models (cherry-picking and rebasing).
Linus
next prev parent reply other threads:[~2022-12-12 23:33 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-12 21:44 Andrew Morton
2022-12-12 22:16 ` Jason A. Donenfeld
2022-12-12 22:27 ` Andrew Morton
2022-12-12 23:16 ` Vlastimil Babka
2022-12-13 2:35 ` Andrew Morton
2022-12-13 2:44 ` Linus Torvalds
2022-12-13 2:58 ` Stephen Rothwell
2022-12-12 23:33 ` Linus Torvalds [this message]
2022-12-13 1:32 ` Linus Torvalds
2022-12-13 1:39 ` pr-tracker-bot
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='CAHk-=wisHBccs=VyL5DBUOmd2pge4OM6An9T600B4rmgnX5mNg@mail.gmail.com' \
--to=torvalds@linux-foundation.org \
--cc=Jason@zx2c4.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mm-commits@vger.kernel.org \
/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