Anonymous committed 1c73bb0

user-manual: reset to ORIG_HEAD not HEAD to undo merge

As Linus pointed out recently on the mailing list,

git reset --hard HEAD^

doesn't undo a merge in the case where the merge did a fast-forward. So
the rcommendation here is a little dangerous.

Signed-off-by: "J. Bruce Fields" <>
Signed-off-by: Junio C Hamano <>

Comments (0)

Files changed (1)


 Or, if you've already commited the merge that you want to throw away,
-$ git reset --hard HEAD^
+$ git reset --hard ORIG_HEAD
 However, this last command can be dangerous in some cases--never
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.