| commit | 22d99f012f9b33ede37c47a195bad7c12dae596b | |
| author | Elijah Newren <newren@gmail.com> | |
| Fri, 24 Nov 2023 11:10:41 +0000 (24 12:10 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 26 Nov 2023 01:10:49 +0000 (26 10:10 +0900) | ||
| tree | abe2a7b6d4313c73d0533bbc91ffe45a3d25feef | treesnapshot (tar.gz zip) |
| parent | 3916ec307eda00d1aab23cf8d1b6ddc5c4f3601d | commitdiff |
replay: add --advance or 'cherry-pick' mode
There is already a 'rebase' mode with `--onto`. Let's add an 'advance' or
'cherry-pick' mode with `--advance`. This new mode will make the target
branch advance as we replay commits onto it.
The replayed commits should have a single tip, so that it's clear where
the target branch should be advanced. If they have more than one tip,
this new mode will error out.
Co-authored-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
There is already a 'rebase' mode with `--onto`. Let's add an 'advance' or
'cherry-pick' mode with `--advance`. This new mode will make the target
branch advance as we replay commits onto it.
The replayed commits should have a single tip, so that it's clear where
the target branch should be advanced. If they have more than one tip,
this new mode will error out.
Co-authored-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/git-replay.txt | diffblobblamehistory | |
| builtin/replay.c | diffblobblamehistory | |
| t/t3650-replay-basics.sh | diffblobblamehistory |