Skip to content

Commit 749073f

Browse files
committed
add note about rebaseChangedLocalHistory & it's needed fixes
Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
1 parent 701c6e1 commit 749073f

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

git-stacked-rebase.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -575,6 +575,10 @@ export const gitStackedRebase = async (
575575
* this logic implies that we should always be doing `--apply`,
576576
* TODO thus consider.
577577
*
578+
* note 2.2 / 3.1:
579+
* oh, we actually should be doing the `--apply` in a lot more cases,
580+
* e.g. when a local branch is moved (currently we don't!)
581+
*
578582
*/
579583
const oldLatestBranchCmd: GoodCommandStacked = goodCommands[oldLatestBranchCmdIndex] as GoodCommandStacked; // TODO TS
580584
const newLatestBranchCmd: GoodCommandStacked = goodCommands[newLatestBranchCmdIndex] as GoodCommandStacked; // TODO TS

0 commit comments

Comments
 (0)