The manual mixed both caret(HEAD^) and tilde (HEAD~N) notation in examples. This may be xconfusing to new users. The "counting" notation HEAD~N likely to be grasped more easily because it allow successive numbering 1, 2, 3 etc. Signed-off-by: Jari Aalto <jari.aalto@xxxxxxxxx> --- Documentation/git-reset.txt | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt index 15e3aca..c42cd26 100644 --- a/Documentation/git-reset.txt +++ b/Documentation/git-reset.txt @@ -55,7 +55,7 @@ Undo a commit and redo:: + ------------ $ git commit ... -$ git reset --soft HEAD^ <1> +$ git reset --soft HEAD~1 <1> $ edit <2> $ git commit -a -c ORIG_HEAD <3> ------------ @@ -77,7 +77,7 @@ $ git commit ... $ git reset --hard HEAD~3 <1> ------------ + -<1> The last three commits (HEAD, HEAD^, and HEAD~2) were bad +<1> The last three commits (HEAD, HEAD~1, and HEAD~2) were bad and you do not want to ever see them again. Do *not* do this if you have already given these commits to somebody else. @@ -162,7 +162,7 @@ $ git checkout master $ fix fix fix $ git commit ;# commit with real log $ git checkout feature -$ git reset --soft HEAD^ ;# go back to WIP state <2> +$ git reset --soft HEAD~1 ;# go back to WIP state <2> $ git reset <3> ------------ + -- 1.5.3.rc5 -- Welcome to FOSS revolution: we fix and modify until it shines - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
