Release GitComet Professional launches 1d 08h 40m 50s

Join the waitlist for the early-adopter price Join waitlist

GitComet in action · 43 seconds

Pick the Fix, Leave the Rest

Bring one fix from a feature branch onto main without merging the rest of the branch. Then squash two unpushed commits into a single commit before pushing.

Playing loads the video from YouTube (Google).

Follow along

Steps shown in the video

Recorded on Linux. The shortcuts below match the recording.

  1. Mark main for comparison, then compare the feature branch with it to identify the fix you need.
  2. With main checked out, right-click the fix commit and choose Cherry-pick. Only that commit’s changes come onto main.
  3. Review the new commit and the other unpushed commit on main.
  4. Shift-select the two commits, open their actions menu and choose Squash 2 commits.
  5. Review the combined message and complete the squash. The selected changes are now one commit, ready to push.