• atyaz@reddthat.com
    link
    fedilink
    arrow-up
    2
    arrow-down
    1
    ·
    1 year ago

    “Reapply” is rewriting it on the other branch. The branch you are rebasing to now has a one or multiple commits that do not represent real history. Only the very last commit on the branch is actually what the user rebasing has on their computer.

    • yogo@lemm.ee
      link
      fedilink
      arrow-up
      1
      ·
      1 year ago

      Cherry picking also rewrites the commits. This is equivalent to rebasing:

      git branch -f orig_head
      git reset target
      git cherry-pick ..orig_head