Version Control Development Tutorials, Guides & Insights

No preview available for this content.

git cherry-pick allows you to apply changes introduced by an existing commit onto the current branch. This is particularly useful when you want to bring a specific commit from one branch into another without merging the entire branch.

# Cherry-pick a single commit
git cherry-pick <commit-hash>

# Cherry-pick multiple commits
git cherry-pick <commit-hash1> <commit-hash2> ...

# Cherry-pick a range of commits
git cherry-pick <commit-hash1>^..<commit-hash2>

# Continue cherry-picking after resolving conflicts
git cherry-pick --continue

# Abort a cherry-pick operation
git cherry-pick --abort

You can combine multiple Git tasks into a single script to streamline your workflow. For example, you can create a script that pulls the latest changes, merges a branch, and pushes the changes:

#!/bin/bash

# Pull the latest changes with rebase
git fetch origin
git pull --rebase origin $(git branch --show-current)

# Merge a specified branch
if [ -n "$1" ]; then
  git checkout "$1"
  git pull origin "$1"
  git checkout -
  git merge "$1"
  git push
  echo "Merged branch '$1' into the current branch and pushed changes."
fi

echo "Workflow completed successfully!"