diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-09-10 11:46:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-10 11:46:19 -0700 |
| commit | 6c083b7619f171d32df633ca0281653afabd788f (patch) | |
| tree | 1b1284680cfdfdee92314da6ea0978658bef24b1 /t/t4108-apply-threeway.sh | |
| parent | The fourth batch (diff) | |
| parent | sequencer: advise if skipping cherry-picked commit (diff) | |
| download | tgif-6c083b7619f171d32df633ca0281653afabd788f.tar.xz | |
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
Diffstat (limited to 't/t4108-apply-threeway.sh')
0 files changed, 0 insertions, 0 deletions