473
History repeats itself (lemmy.world)
submitted 10 months 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 5 points 10 months ago

That is absolutely not what rebasing does. Rebasing rewrites the commit history, cherry picking commits then doing a normal merge does not rewrite any history.

[-] yogo@lemm.ee 9 points 10 months ago* (last edited 10 months 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 reapply 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. https://git-scm.com/docs/git-rebase

[-] atyaz@reddthat.com 1 points 10 months 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 10 months 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
473 points (97.4% liked)

Programmer Humor

18319 readers
1605 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
Vacant@programming.dev
anzo@programming.dev
BurningTurtle@programming.dev