From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 10 Sep 2021 18:46:19 +0000 (-0700)
Subject: Merge branch 'js/advise-when-skipping-cherry-picked'
X-Git-Tag: v2.34.0-rc0~198
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6c083b7619f171d32df633ca0281653afabd788f;p=thirdparty%2Fgit.git

Merge branch 'js/advise-when-skipping-cherry-picked'

"git rebase" by default skips changes that are equivalent to
commits that are already in the history the branch is rebased onto;
give messages when this happens to let the users be aware of
skipped commits, and also teach them how to tell "rebase" to keep
duplicated changes.

* js/advise-when-skipping-cherry-picked:
  sequencer: advise if skipping cherry-picked commit
---

6c083b7619f171d32df633ca0281653afabd788f