| commit | 6c083b7619f171d32df633ca0281653afabd788f | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 10 Sep 2021 18:46:19 +0000 (10 11:46 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 10 Sep 2021 18:46:19 +0000 (10 11:46 -0700) | ||
| tree | 1b1284680cfdfdee92314da6ea0978658bef24b1 | treesnapshot (tar.gz zip) |
| parent | 8463beaeb69fe0b7f651065813def4aa6827cd5d | commitdiff |
| parent | 767a4ca648f8791c1fb623bd9f79fd8d7f026499 | commitdiff |
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
"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 | blobhistory |
| advice.c | diff1 | diff2 | blobhistory |
| advice.h | diff1 | diff2 | blobhistory |
| builtin/rebase.c | diff1 | diff2 | blobhistory |
| sequencer.c | diff1 | diff2 | blobhistory |