yogo

@yogo@lemm.ee

• ⁨Comment⁩ on ⁨History repeats itself⁩ ⁨⁨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
  

• ⁨Comment⁩ on ⁨History repeats itself⁩ ⁨⁨1⁩ ⁨year⁩ ago⁩:

  Have you tried interactive rebase (rebase -i)? I find it very useful

• ⁨Comment⁩ on ⁨History repeats itself⁩ ⁨⁨1⁩ ⁨year⁩ ago⁩:

  I’m sorry but that’s incorrect. “Rewriting the commit history” is not possible in git, since commits are immutable. What rebase actually does is apply each commit between upstream and head on top of upstream, and then reset the current branch to the last commit applied (This is by default, assuming no interactive rebase and other advanced uses). But don’t take my word for it, just read the manual. git-scm.com/docs/git-rebase

• ⁨Comment⁩ on ⁨History repeats itself⁩ ⁨⁨1⁩ ⁨year⁩ ago⁩:

  That’s called rebasing