From: Jari Aalto <jari.aalto@cante.net>
To: git@vger.kernel.org
Subject: [PATCH] git-reset.txt: Use uniform HEAD~N notation in all examples
Date: Fri, 31 Aug 2007 20:47:11 +0300 [thread overview]
Message-ID: <tzqfsijk.fsf@cante.net> (raw)
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@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 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
next reply other threads:[~2007-08-31 17:43 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-31 17:47 Jari Aalto [this message]
2007-08-31 19:00 ` [PATCH] git-reset.txt: Use uniform HEAD~N notation in all examples Junio C Hamano
2007-09-01 8:39 ` Jari Aalto
2007-09-01 9:40 ` Junio C Hamano
2007-09-01 15:01 ` Shawn Bohrer
2007-09-01 20:40 ` Jari Aalto
2007-09-03 2:03 ` Miles Bader
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tzqfsijk.fsf@cante.net \
--to=jari.aalto@cante.net \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox