467
History repeats itself (lemmy.world)
submitted 1 year ago by alphacyberranger@lemmy.world to c/programmer_humor@programming.dev
35 comments fedilink hide all child comments
you are viewing a single comment's thread
view the rest of the comments
[-] atyaz@reddthat.com 1 points 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 2 points 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
this post was submitted on 14 Aug 2023
467 points (97.2% liked)

Programmer Humor

19589 readers
486 users here now

Welcome to Programmer Humor!

This is a place where you can post jokes, memes, humor, etc. related to programming!

For sharing awful code theres also Programming Horror.

Rules

founded 1 year ago
MODERATORS
Feyter@programming.dev
anzo@programming.dev
BurningTurtle@programming.dev
pylapp@programming.dev