[PATCH] git-reset.txt: Use commit~1 notation over commit^
- From
jari.aalto@cante.net <jari.aalto@cante.net>
- Date
- Dec 1, 2010, 18:14 UTC
- Message-ID
- <1291227258-17922-1-git-send-email-jari.aalto@cante.net>
From: Jari Aalto <jari.aalto@cante.net>
In order to easily read paragraphs, use same notation and do not mixed both ^ and ~N. This helps digesting the information more easier as the tokens stay the same (dcumentation uniformity).
Signed-off-by: Jari Aalto <jari.aalto@cante.net> --- 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 fd72976..b679c99 100644 --- a/Documentation/git-reset.txt +++ b/Documentation/git-reset.txt @@ -129,7 +129,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> ------------ @@ -166,7 +166,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. (See the "RECOVERING FROM UPSTREAM REBASE" section in linkgit:git-rebase[1] for @@ -237,7 +237,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.7.2.3