Skip to content

Commit e51ba1d

Browse files
committed
fix formatting
1 parent b838720 commit e51ba1d

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

README.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -383,13 +383,9 @@ Reset the branch master to the previous commit:
383383
(master)$ git reset --hard HEAD^
384384
```
385385

386-
`HEAD^` is short for `HEAD^1`. This stands for the first parent of `HEAD`, similarly `HEAD^2` stands for the
386+
`HEAD^` is short for `HEAD^1`. This stands for the first parent of `HEAD`, similarly `HEAD^2` stands for the second parent of the commit (merges can have 2 parents).
387387

388-
second parent of the commit (merges can have 2 parents).
389-
390-
Note that `HEAD^2` is **not** the same as `HEAD~2`
391-
392-
(see [this link](http://www.paulboxley.com/blog/2011/06/git-caret-and-tilde) for more information).
388+
Note that `HEAD^2` is **not** the same as `HEAD~2` (see [this link](http://www.paulboxley.com/blog/2011/06/git-caret-and-tilde) for more information).
393389

394390
Alternatively, if you don't want to use `HEAD^`, find out what the commit hash you want to set your master branch to (`git log` should do the trick). Then reset to that hash. `git push` will make sure that this change is reflected on your remote.
395391

0 commit comments

Comments
 (0)