32 secondsBorrow Changes, Commit Later
Apply selected files from another branch without bringing over its commits. GitComet stages the chosen changes on your current branch so you can review them before creating a commit.
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.
Watch on YouTube ↗ Download MP4 Watch the playlist on YouTube ↗
Follow along
Steps shown in the video
Recorded on Linux. The shortcuts below match the recording.
- Mark main for comparison, then compare the feature branch with it to identify the fix you need.
- With main checked out, right-click the fix commit and choose Cherry-pick. Only that commit’s changes come onto main.
- Review the new commit and the other unpushed commit on main.
- Shift-select the two commits, open their actions menu and choose Squash 2 commits.
- Review the combined message and complete the squash. The selected changes are now one commit, ready to push.
Keep exploring
32 seconds
38 secondsRewrite History, Cleanly
Clean up a branch with GitComet’s interactive rebase editor. Fold fixup commits into their targets, reorder the remaining commits and replace an unclear commit message before completing the rebase.
48 secondsStage Only What Matters
Turn several edits in one file into focused commits. Select and stage just the fix, discard a debug line, and edit a remaining typo directly in GitComet before committing the rest.