From: Junio C Hamano <gitster@pobox.com>
To: Jay Soffian <jaysoffian@gmail.com>
Cc: Michael J Gruber <git@drmicha.warpmail.net>,
git@vger.kernel.org, Christian Couder <chriscool@tuxfamily.org>,
A Large Angry SCM <gitzilla@gmail.com>
Subject: Re: [PATCH 3/6] git-reset.txt: reset --soft is not a no-op
Date: Mon, 13 Sep 2010 16:19:57 -0700 [thread overview]
Message-ID: <7v39tdb59e.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <AANLkTin1Ht+2Q4v5pyt8p11VmQ275C41rJLMLLuLkEfA@mail.gmail.com> (Jay Soffian's message of "Mon\, 13 Sep 2010 18\:13\:55 -0400")
Jay Soffian <jaysoffian@gmail.com> writes:
> On Mon, Sep 13, 2010 at 4:06 AM, Michael J Gruber
> <git@drmicha.warpmail.net> wrote:
>> Make it clearer that git reset --soft actually does something (changing
>> HEAD). While it is meantioned in the previous paragraph already it can
>> be easily overlooked otherwise.
>>
>> Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
>> ---
>> Documentation/git-reset.txt | 3 ++-
>> 1 files changed, 2 insertions(+), 1 deletions(-)
>>
>> diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
>> index 8fb871c..65f5d07 100644
>> --- a/Documentation/git-reset.txt
>> +++ b/Documentation/git-reset.txt
>> @@ -43,7 +43,8 @@ linkgit:git-add[1]).
>> --
>> --soft::
>> Does not touch the index file nor the working tree at all, but
>> - requires them to be in a good order. This leaves all your changed
>> + requires them to be in good order (and sets the head to <commit>,
>> + just like all modes do). This leaves all your changed
>> files "Changes to be committed", as 'git status' would
>> put it.
>
> What does "requires them to be in good order" mean anyway?
Good point. I don't think it means anything now; for that matter I do not
think it meant anything even back when that sentence was added in f67545e
(Docs for git-reset-script., 2005-09-07). A soft reset doesn't even look
at the index nor the working tree, so there is no good nor bad order
there.
Just remove it.
next prev parent reply other threads:[~2010-09-13 23:20 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-13 8:06 [PATCH 0/6] git-reset.txt improvements Michael J Gruber
2010-09-13 8:06 ` [PATCH 1/6] git-reset.txt: clarify branch vs. branch head Michael J Gruber
2010-09-14 0:35 ` Junio C Hamano
2010-09-13 8:06 ` [PATCH 2/6] git-reset.txt: reset does not change files in target Michael J Gruber
2010-09-14 0:12 ` Junio C Hamano
2010-09-13 8:06 ` [PATCH 3/6] git-reset.txt: reset --soft is not a no-op Michael J Gruber
2010-09-13 22:13 ` Jay Soffian
2010-09-13 23:19 ` Junio C Hamano [this message]
2010-09-13 8:06 ` [PATCH 4/6] git-reset.txt: use "working tree" consistently Michael J Gruber
2010-09-13 8:06 ` [PATCH 5/6] git-reset.txt: point to git-checkout Michael J Gruber
2010-09-14 0:19 ` Junio C Hamano
2010-09-13 8:06 ` [PATCH 6/6] git-reset.txt: make modes description more consistent Michael J Gruber
2010-09-14 0:35 ` Junio C Hamano
2010-09-15 20:47 ` Michael J Gruber
2010-09-13 22:15 ` [PATCH 0/6] git-reset.txt improvements Jay Soffian
2010-09-15 20:47 ` [PATCHv2 " Michael J Gruber
2010-09-15 20:47 ` [PATCHv2 1/6] git-reset.txt: clarify branch vs. branch head Michael J Gruber
2010-09-15 20:47 ` [PATCHv2 2/6] git-reset.txt: reset does not change files in target Michael J Gruber
2010-09-15 20:47 ` [PATCHv2 3/6] git-reset.txt: reset --soft is not a no-op Michael J Gruber
2010-09-15 20:47 ` [PATCHv2 4/6] git-reset.txt: use "working tree" consistently Michael J Gruber
2010-09-15 20:47 ` [PATCHv2 5/6] git-reset.txt: point to git-checkout Michael J Gruber
2010-09-15 20:47 ` [PATCHv2 6/6] git-reset.txt: make modes description more consistent Michael J Gruber
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=7v39tdb59e.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=chriscool@tuxfamily.org \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=gitzilla@gmail.com \
--cc=jaysoffian@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).