this post was submitted on 11 Nov 2023
15 points (100.0% liked)

Git

2910 readers
1 users here now

Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency.

Resources

Rules

  1. Follow programming.dev rules
  2. Be excellent to each other, no hostility towards users for any reason
  3. No spam of tools/companies/advertisements. It’s OK to post your own stuff part of the time, but the primary use of the community should not be self-promotion.

Git Logo by Jason Long is licensed under the Creative Commons Attribution 3.0 Unported License.

founded 1 year ago
MODERATORS
Ategon
canpolat
jnovinger
15
How git cherry-pick and revert use 3-way merge (jvns.ca)
submitted 1 year ago by canpolat to c/git
3 comments fedilink hide all child comments
you are viewing a single comment's thread
view the rest of the comments
[–] lysdexic 2 points 1 year ago

What a treat. I have to admit that my mental model of git cherry-pick was just "it takes a change and applies it as a patch". I guess it isn't. That would explain a couple of experiences I had where a cherry-pick came with a lot of unrelated crap tied to it.

TIL.