43 secondsPick 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.
GitComet in action · 32 seconds
Borrow 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.
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.
- With main checked out, compare the feature branch with main to see which files differ.
- Ctrl-click the changed files you want to bring over, leaving the other files unselected.
- Choose Apply changes. When asked whether to commit the applied changes, choose No.
- Return to the working tree. The selected changes are staged on main, and no new commit has been created.
- Review the staged diff, adjust the changes if needed and commit when you are ready.
Keep exploring
43 seconds
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.
40 secondsMerge Conflicts, Solved
Resolve a Git merge with two conflicted files. GitComet handles the unambiguous conflicts, then lets you choose a side or keep both changes before committing the result.