git show b4e0a66 second diff --git a/file b/file index 5626abf..814f4a4 100644 --- a/file +++ b/file @@ -1 +1,2 @@ one +two # each line of file is a commit: git log --oneline 7c90d08 fifth 1925ec4 forth adf9108 third b4e0a66 second dc10ab7 first cat file one two three four five git revert b4e0a66 error: could not revert b4e0a66... second hint: after resolving the conflicts, mark the corrected paths hint: with 'git add ' or 'git rm ' hint: and commit the result with 'git commit' cat file one <<<<<<< HEAD two three four five ======= >>>>>>> parent of b4e0a66... second