Aborting a merge

After starting a merge, you might want to stop the merge and return everything to its pre-merge state. Use --abort:

git merge --abort

Found a mistake? Have a question or improvement idea? Let me know.

Merging:

*Syntax

*Automatic merging

*Merge one branch into another

*Aborting a merge

*Keep changes from only one side of a merge

*Merge with a commit

*Finding all branches with no merged changes

Table Of Contents

0Getting started

1Committing

2Browsing the history

3Undoing

4Staging

5Git diff

6Merging

7Ignoring files and folders

8Working with remotes

10Aliases

21Different workflows

22Pulling

23Hooks

24Cloning repositories

28Pushing

30git-tfs

31Empty directories in git

32git-svn

33Archive

34Rewriting history with filter-branc

35Migrating to git

36Show

37Resolving merge conflicts

38Bundles

39Display commit history graphically with gitk

40Bisecting to find faulty commits

41Blaming

42Git revisions syntax

43Worktrees

44Git remote

45Git large file storage

50reflog - restoring commits not shown in git log

51TortoiseGit

52External merge and diff tools

53Update object name in reference

54Git branch name on Bash Ubuntu

55Git client-side hooks

56Git rerer

57Change git repository name

58git tagging

59tidying up your local and remote repository

60diff tree

61Contributors