Keyboard shortcuts

Press ← or → to navigate between chapters

Press S or / to search in the book

Press ? to show this help

Press Esc to hide this help

Wrong Source

Use Case

○  h  <- Paste
○  g
│ ○  f
│ ○  e
│ ○  d  <- Cut
│ ○  c  <- You should have cut here
├─╯
○  b
○  a
◆
  • You rebase:
$ jj rebase -s d -o h

×  f
×  e
×  d
○  h  <- Paste
○  g
│
│ ○  c  <- Left over
├─╯
○  b
○  a
◆
  • Conflicts.
  • You realize you forgot to include some Changes in the rebase (the Change c here).

Solution

Add the missing Changes:

jj rebase -r c --after h

○  f
○  e
○  d
○  c
○  h
○  g
○  b
○  a
◆