What does git cherry-pick <commit> do?

----
Check out the correct answer and reinforce your Git knowledge with immediate feedback on every quiz question here πŸ‘‰ https://www.git-skills.dev/quiz/advanced-git/

#Git #SmartGit #Coding #Programming #SoftwareEngineering #Developer #TechTips #CodeNewbie #100DaysOfCode #GitRebase #TechQuiz

Picks best from branches
0%
Highlights in log view
0%
Applies specific commit
100%
New branch from commit
0%
Poll ended at .
Advanced Git - Git Skills | Git Skills | SmartGit

Challenge yourself with advanced Git concepts like rebasing, cherry-picking, and submodules.

Git Skills

What can you do with git rebase -i (interactive rebase)?

----
Check out the correct answer and reinforce your Git knowledge with immediate feedback on every quiz question here πŸ‘‰ https://www.git-skills.dev/quiz/advanced-git/

#Git #SmartGit #Coding #Programming #SoftwareEngineering #Developer #TechTips #CodeNewbie #100DaysOfCode #GitRebase #TechQuiz

Only reorder commits
0%
Edit, squash, drop & more
100%
Only squash commits
0%
Create new branches
0%
Poll ended at .
Advanced Git - Git Skills | Git Skills | SmartGit

Challenge yourself with advanced Git concepts like rebasing, cherry-picking, and submodules.

Git Skills

Which situation is the best fit for git pull --rebase?

----
Check out the correct answer and reinforce your Git knowledge with immediate feedback on every quiz question here πŸ‘‰ https://www.git-skills.dev/quiz/rebase-plain/

#Git #SmartGit #Coding #Programming #SoftwareEngineering #Developer #TechTips #CodeNewbie #100DaysOfCode #GitRebase #TechQuiz

To force a merge commit
5.9%
Preserve exact commit IDs
5.9%
Avoid stashing changes
11.8%
Catch up & keep it linear
76.5%
Poll ended at .
Git Rebase - Git Skills | Git Skills | SmartGit

Practice everyday rebasing, `git pull --rebase`, conflict handling, and recovery without interactive rebase.

Git Skills

When your branch has local commits and upstream has new commits, what does git pull --rebase do differently from plain git pull?

----
Check out the correct answer and reinforce your Git knowledge with immediate feedback on every quiz question here πŸ‘‰ https://www.git-skills.dev/quiz/rebase-plain/

#Git #SmartGit #Coding #Programming #SoftwareEngineering #CodeNewbie #100DaysOfCode #TechTips #Developer #GitRebase

Force-pushes branch
0%
Discards local commits
0%
Replays instead of merge
100%
Only for new branches
0%
Poll ended at .
Git Rebase - Git Skills | Git Skills | SmartGit

Practice everyday rebasing, `git pull --rebase`, conflict handling, and recovery without interactive rebase.

Git Skills

Nice git experience.

With A and B being logical streams of development I made a mess:

main -> A1 -> B1 -> A2 -> B2 -> B3
\-> A3
\-> B4 ... B10

I mixed A, B before noticing the need for 2 branches. I did:

- Switch to A3, rebase interactively to B1'...B3' A1'...A3'
- Switch to B3, rebase interactively and delete all the Ai in front
- Rebase B10 onto B3'.

I de-mixed two streams of development into their respective branches.πŸ˜€

Watch it happen with gitk --reflog.

#git #GitRebase

πŸŽ‰ Behold! A thrilling tale of coders quaking in their boots at the mere mention of "git rebase"😱. Fear not, dear reader, because in this extensive guide, we're assured that the very worst outcome is... wait for it... deleting your work! πŸ€”πŸ’₯ Because nothing spells confidence like a digital facepalm.
https://www.brethorsting.com/blog/2026/01/git-rebase-for-the-terrified/ #gitrebase #codingadventures #digitalfacepalm #programmerhumor #techguides #HackerNews #ngated
Git Rebase for the Terrified | Aaron Brethorst

Personal website for Aaron Brethorst - Seattleite, technology leader, photographer, transit enthusiast, erstwhile non-runner.

Stacked Diffs with `git rebase --onto`

Using git `rebase --onto` workflow to work with stacked diffs

Starting Monday off with a nasty Git merge conflict and some rebase loop hell. Because why not.

#Git #GitRebase

`git rebase -i --rebase-merges`
allows you to recreate merge commits in the history; absolutely mind blowing

I hope I'll never use it.

#git #GitRebase

@raboof Oh, nice!

> the break command (added in Git 2.20)


Sweet! I've been using the trick originally described, putting a dummy edit after the merge and then resetting back to the merge, for years!

I absolutely love --rebase-merges and use it many times per day to build and keep track of multiple parallel PRs.

#git #GitRebase #GitRebaseInteractive