Git Cheat Sheet/Abort merge

Return to pre-merge state after conflicts.

Section: Merge, Rebase, and Commit Selection

Abort merge

bash
bash
git merge --abort

Learn the surrounding workflow

Compare similar commands or jump into common fixes when this command is part of a bigger troubleshooting path.

Related commands

Same sheet · prioritizing Merge, Rebase, and Commit Selection
Enable rerere
Reuse recorded resolution for repeated conflicts.
OpenIn sheetbash1 tag match
Discard unstaged changes
Restore file contents from HEAD or index.
OpenIn sheetbash1 tag match
Unstage a path
Remove a file from the index without losing edits.
OpenIn sheetbash1 tag match
Set global user name
Set default author name.
Initialize repository
Create a new repository in the current directory.
Status short format
Compact status listing.