How to quit (not abort) a Git merge in progress keeping the changes uncommitted?

by

With Git 2.23 (Q3 2019), this will be easier (no more git reset), since “git merge” learned “--quit” option that cleans up the in-progress merge while leaving the working tree and the index still in a mess.

See commit f3f8311 (18 May 2019), and commit b643355 (09 May 2019) by Nguyễn Thái Ngọc Duy (pclouds).
(Merged by Junio C Hamano — gitster — in commit c4a38d1, 13 Jun 2019)

merge: add --quit

This allows to cancel the current merge without resetting worktree/index, which is what –abort is for.
Like other --quit(s), this is often used when you forgot that you’re in the middle of a merge and already switched away, doing different things.
By the time you’ve realized, you can’t even continue the merge anymore.

This also makes all in-progress commands, am, merge, rebase, revert and
cherry-pick, take all three --abort, --continue and --quit (bisect has a
different UI).

The documentation is in commit 437591a (17 Jun 2019) by Phillip Wood (phillipwood).
(Merged by Junio C Hamano — gitster — in commit 0af6d5d, 09 Jul 2019)

git merge --quit:

Forget about the current merge in progress.
Leave the index and the working tree as-is.

More Related Contents:

  1. Undo a Git merge that hasn’t been pushed yet
  2. I ran into a merge conflict. How can I abort the merge?
  3. When do you use Git rebase instead of Git merge?
  4. How to cherry-pick a range of commits and merge them into another branch?
  5. Have Git Select Local Version On Merge Conflict on a Specific File?
  6. How can I selectively merge or pick changes from another branch in Git?
  7. Git workflow and rebase vs merge questions
  8. How can I merge multiple commits onto another branch as a single squashed commit?
  9. Merge, update, and pull Git branches without using checkouts
  10. Re-doing a reverted merge in Git
  11. Why does git perform fast-forward merges by default?
  12. Git merge left HEAD marks in my files
  13. Is there a git-merge –dry-run option?
  14. .gitignore and “The following untracked working tree files would be overwritten by checkout”
  15. How do I safely merge a Git branch into master?
  16. git remove merge commit from history
  17. Which version of the git file will be finally used: LOCAL, BASE or REMOTE?
  18. Git merge error “commit is not possible because you have unmerged files”
  19. tell git to use ours merge strategy on specific files
  20. Merge development branch with master
  21. how can I customize git’s merge commit message?
  22. error: Your local changes to the following files would be overwritten by checkout
  23. How can I configure KDiff3 as a merge tool and diff tool for git?
  24. How do I fix a merge conflict due to removal of a file in a branch?
  25. Sharing rerere cache
  26. How to merge specific files from Git branches
  27. git: merge two branches: what direction?
  28. Telling if a Git commit is a Merge/Revert commit
  29. Git merge branch into master
  30. The following untracked working tree files would be overwritten by merge, but I don’t care

Leave a Comment