Git cherry-pick is used to apply a specific commit from one branch to another. 1. Apply a hotfix from main to a feature branch without merging all changes. 2. Share a security patch across multiple release branches like v1.2 and v1.3. 3. Recover a lost commit after a reset using its hash from git reflog. 4. Move a commit made on the wrong branch to the correct one when rebase isn't ideal. Use it cautiously to avoid duplicate commits, broken dependencies, and rewriting shared history, as cherry-picked commits have new hashes and can cause conflicts if the original branch is later merged. It is best suited for targeted, single-commit applications and not for regular integration of multiple changes.
Git cherry-pick is a command that lets you take a single commit from one branch and apply it to another. Instead of merging entire branches or rebasing a sequence of commits, cherry-pick allows you to selectively bring over just one (or a few) specific changes.
It’s like plucking a single cherry from a tree and placing it somewhere else—hence the name.
When Should You Use Cherry-Pick?
1. Apply a Hotfix from One Branch to Another
Imagine you’re working on a feature branch and discover a critical bug in production. You quickly fix it on the main branch with a dedicated commit. Now, you want that fix in your feature branch too, without merging all of main.
Instead of merging or rebasing, you can:
git checkout feature/login-redesign git cherry-pick abc1234
This applies just the fix (commit abc1234) to your current branch.
This is especially useful when you want to avoid bringing in unrelated changes from
main.
2. Share a Specific Change Across Multiple Release Branches
Suppose you maintain multiple versions of your app (e.g., release/v1.2, release/v1.3). A security patch is made in v1.3, but it also needs to go into v1.2. Cherry-picking the patch commit ensures consistency without merging entire feature sets.
Example:
git checkout release/v1.2 git cherry-pick def5678
3. Recover a Commit Lost After a Reset
If you accidentally reset a branch and lost a commit, but still have the commit hash (e.g., from git reflog), cherry-pick can bring it back.
git cherry-pick <lost-commit-hash>
This is cleaner than re-creating the change manually.
4. Move a Commit to a Different Branch (When Rebase Isn’t Ideal)
Sometimes you make a commit on the wrong branch—say, you committed a config change on develop but it belongs on config-update. Instead of stashing and reapplying, you can:
git checkout config-update git cherry-pick <commit-hash>
Then remove the original commit with a reset (if needed).
?? Be cautious: cherry-picking creates a new commit with the same changes but a different hash. This can cause confusion if the original commit is later merged.
Things to Watch Out For
- Duplicate commits: If you cherry-pick a commit and later merge the original branch, Git sees them as separate changes—even though the content might be identical. This can lead to conflicts or redundant code.
- Lost context: Cherry-picking pulls changes, not intent. If the commit depends on other changes not present in the target branch, it may break things.
- Rewriting history: Like rebase, avoid cherry-picking commits that are already pushed and shared unless you’re certain no one else is using them.
Summary
Use git cherry-pick when you need:
- ? A single, specific commit applied to another branch
- ? A quick way to propagate fixes across branches
- ? Recovery of a lost or misplaced commit
Avoid it when:
- ? You’re moving multiple commits (use rebase or merge instead)
- ? The commit has dependencies not present in the target branch
- ? You’re working in a shared branch and rewriting history could affect others
Used wisely, cherry-pick is a precise tool for surgical code application. Misused, it can create messy histories and duplicate changes.
Basically, it's a "grab one change" tool—great in the right situation, but not for everyday merging.
The above is the detailed content of What is Git Cherry-Pick and When Should You Use It?. For more information, please follow other related articles on the PHP Chinese website!
Hot AI Tools
Undress AI Tool
Undress images for free
Undresser.AI Undress
AI-powered app for creating realistic nude photos
AI Clothes Remover
Online AI tool for removing clothes from photos.
ArtGPT
AI image generator for creative art from text prompts.
Stock Market GPT
AI powered investment research for smarter decisions
Hot Article
Hot Tools
Notepad++7.3.1
Easy-to-use and free code editor
SublimeText3 Chinese version
Chinese version, very easy to use
Zend Studio 13.0.1
Powerful PHP integrated development environment
Dreamweaver CS6
Visual web development tools
SublimeText3 Mac version
God-level code editing software (SublimeText3)
What is COOKIE DAO? How to buy it? COOKIE Price Forecast 2025-2030
Aug 25, 2025 pm 05:57 PM
Directory What is COOKIEDAO? COOKIEDAO Token Economics Current Market Conditions and Factors Influencing COOKIE Prices COOKIE 2025-2026 Price Forecast COOKIE 2029-2030 Price Forecast 2025-2030 Price Forecast Price List Which exchanges are COOKIE coins traded? How to buy Binance (Binance) BybitBitgetKuCoinMEXCBTCCCOOKIE coins? Conclusion?CookieDAO's $ after reaching an all-time high of $0.7652 on January 10, 2025
Wall Street Whale Devours Ethereum: Interpretation of the Pricing Power Battle Behind Purchase 830,000 ETH in 35 Days
Aug 22, 2025 pm 07:18 PM
Table of Contents Two ancestry, two worldviews: The philosophical showdown between OG coins hoarding and Wall Street harvesting. Financial engineering dimensionality reduction strike: How BitMine reconstructs ETH pricing power in 35 days. New dealer spokesperson: TomLee and Wall Street narrative manipulation ecological reconstruction: How Wall Street Capital reshapes the ETH value chain. A small company that was originally unknown in Nasdaq increased its holdings from zero violence to 830,000 in just 35 days. Behind it is a survival philosophy showdown between the indigenous people in the currency circle and Wall Street Capital. On July 1, 2025, BitMine's ETH position was still zero. 35 days later, this family is unknown
Delphi Digital: Learn from history, how does interest rate cuts affect the short-term trend of Bitcoin? Analysis of this article
Sep 08, 2025 pm 02:33 PM
Contents 2019: Expected rise, fall after cashing out 2020: Exceptions under emergency rate cuts 2024: Narrative overwhelms liquidity September 2025: Conditional market starts Core view Markets generally expect the Fed to conduct its first rate cut in this cycle in September. Historically, Bitcoin usually rose before the introduction of loose policies, but fell back after interest rate cuts were implemented. However, this pattern is not always true. This article will review the situation in 2019, 2020 and 2024 to predict possible trends in September 2025. ?2019: Expected rise, after cashing out
How to identify current trends/narratives in the crypto market? Methods for identifying current trends in crypto markets
Aug 26, 2025 pm 05:18 PM
Table of Contents 1. Observe the tokens with leading gains in the exchange 2. Pay attention to trend signals on social media 3. Use research tools and institutional analysis reports 4. Deeply explore on-chain data trends 5. Summary and strategic suggestions In the crypto market, narrative not only drives capital flow, but also profoundly affects investor psychology. Grasping the rising trend often means higher returns potential; while misjudgment may lead to high-level takeovers or missed opportunities. So, how can we identify the narrative that dominates the market at present? Which areas are attracting a lot of capital and attention? This article will provide you with a set of practical methods to help you accurately capture the hot pulse of the crypto market. 1. The most intuitive signal of observing the leading tokens on the exchange often comes from price performance. When a narrative begins
What is Git Cherry-Pick and When Should You Use It?
Aug 29, 2025 am 09:04 AM
Gitcherry-pickisusedtoapplyaspecificcommitfromonebranchtoanother.1.Applyahotfixfrommaintoafeaturebranchwithoutmergingallchanges.2.Shareasecuritypatchacrossmultiplereleasebrancheslikev1.2andv1.3.3.Recoveralostcommitafteraresetusingitshashfromgitreflog
What is Multiple Network (MTP currency)? How about it? Introduction to MTP coin technology architecture, token economics and roadmap
Aug 26, 2025 pm 05:06 PM
Directory What is MultipleNetwork? Typical use cases (example) MultipleNetwork technology architecture and overall product module method P2P SD-WAN: How to "monetize" distributed bandwidth? Encryption and Privacy: Anonymous Communication End-to-end encryption De-WAN and Edge Accelerated Token Economics (Supply|Utility|Allocation|Airdrop/Incentive) Total Supply and Role Testnet Incentives and Distribution of Volume Conditions and Release Participants’ Value Path Ecosystem and Application Synergy Interface Progress and Roadmap (2024-2025) Risk and Attention
What is Simon's Cat (CAT Coin)? CAT Price Forecast 2025-2030
Aug 29, 2025 pm 04:12 PM
What is CAT (Simon'sCat)? How does Simon’sCat work? Simon'sCat's Origin Mission and Vision and Other Memecoin's Comparative Unique Features and Community Participation Simon'sCat's Main Products CAT's Token Economic Token Allocation Economic Model Practical and Reward Current Market Conditions and Prices Factors Influencing CAT's (Simon'sCat) Price Is Simon'sCat a Good Investment? CAT(Simon'
What is BIP? Why are they so important to the future of Bitcoin?
Sep 24, 2025 pm 01:51 PM
Table of Contents What is Bitcoin Improvement Proposal (BIP)? Why is BIP so important? How does the historical BIP process work for Bitcoin Improvement Proposal (BIP)? What is a BIP type signal and how does a miner send it? Taproot and Cons of Quick Trial of BIP Conclusion?Any improvements to Bitcoin have been made since 2011 through a system called Bitcoin Improvement Proposal or “BIP.” Bitcoin Improvement Proposal (BIP) provides guidelines for how Bitcoin can develop in general, there are three possible types of BIP, two of which are related to the technological changes in Bitcoin each BIP starts with informal discussions among Bitcoin developers who can gather anywhere, including Twi
