]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8463bea 767a4ca)
Merge branch 'js/advise-when-skipping-cherry-picked'
authorJunio C Hamano <gitster@pobox.com>
Fri, 10 Sep 2021 18:46:19 +0000 (11:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 10 Sep 2021 18:46:19 +0000 (11:46 -0700)
commit6c083b7619f171d32df633ca0281653afabd788f
tree1b1284680cfdfdee92314da6ea0978658bef24b1tree | snapshot
parent8463beaeb69fe0b7f651065813def4aa6827cd5dcommit | diff
parent767a4ca648f8791c1fb623bd9f79fd8d7f026499commit | diff
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
Documentation/git-rebase.txt diff1 | diff2 | blob | history
advice.c diff1 | diff2 | blob | history
advice.h diff1 | diff2 | blob | history
builtin/rebase.c diff1 | diff2 | blob | history
sequencer.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.