public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: Jari Aalto <jari.aalto@cante•net>
To: git@vger•kernel.org
Subject: [PATCH] Documentation/git-reset.txt: Use HEAD~N syntax everywhere (unify examples)
Date: Sat, 02 Feb 2008 03:41:01 +0200	[thread overview]
Message-ID: <3asc6spe.fsf@blue.sea.net> (raw)

The examples in the documentation refer to multiple ~N commits. To
Keep the exampels unified with the same syntax, use ~N in all examples.

Signed-off-by: Jari Aalto <jari.aalto AT 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 a4e0a77..0566956 100644
--- a/Documentation/git-reset.txt
+++ b/Documentation/git-reset.txt
@@ -58,7 +58,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>
 ------------
@@ -80,7 +80,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.
 
@@ -165,7 +165,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.4-rc5.GIT-dirty



-- 
Welcome to FOSS revolution: we fix and modify until it shines

next             reply	other threads:[~2008-02-02  1:42 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-02-02  1:41 Jari Aalto [this message]
2008-02-02  2:37 ` [PATCH] Documentation/git-reset.txt: Use HEAD~N syntax everywhere (unify examples) Johannes Schindelin
2008-02-02  2:59 ` Junio C Hamano
2008-02-02  8:44   ` Mike Hommey
2008-02-02 12:59     ` Jari Aalto
2008-02-02 13:37       ` Jakub Narebski
2008-02-02 20:10         ` Jari Aalto
2008-02-03  2:07           ` Johannes Schindelin
2008-02-02 16:18       ` J. Bruce Fields
2008-02-02 20:15         ` Jari Aalto
2008-02-02 22:39           ` Robin Rosenberg
2008-02-02 21:31         ` Junio C Hamano
2008-02-03 19:30       ` Dmitry Potapov
2008-02-03 23:48         ` Jari Aalto
2008-02-04  0:28           ` Jakub Narebski
2008-02-04 22:33           ` Dmitry Potapov

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:a4e0a77 dfblob:0566956 )
 OR (
bs:"[PATCH] Documentation/git-reset.txt: Use HEAD~N syntax everywhere (unify examples)" )
	(help)

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=3asc6spe.fsf@blue.sea.net \
    --to=jari.aalto@cante$(echo .)net \
    --cc=git@vger$(echo .)kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox