Junio C Hamano 6c083b7619 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

2021-09-10 11:46:19 -07:00

63 KiB

Raw Blame History

View Raw