git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Sergei Organov <osv@javad.com>
Cc: git@vger.kernel.org, J Bruce Fields <bfields@citi.umich.edu>
Subject: Re: [PATCH] user-manual.txt: fix a few mistakes
Date: Tue, 13 Nov 2007 23:19:41 -0800	[thread overview]
Message-ID: <7vlk91mgz6.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <87bq9x7w4d.fsf@osv.gnss.ru> (Sergei Organov's message of "Tue, 13 Nov 2007 21:19:39 +0300")

Sergei Organov <osv@javad.com> writes:

> Signed-off-by: Sergei Organov <osv@javad.com>
> ---
>  Documentation/user-manual.txt |    8 ++++----
>  1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
> index d99adc6..a169ef0 100644
> --- a/Documentation/user-manual.txt
> +++ b/Documentation/user-manual.txt
> @@ -475,7 +475,7 @@ Bisecting: 3537 revisions left to test after this
>  If you run "git branch" at this point, you'll see that git has
>  temporarily moved you to a new branch named "bisect".  This branch
>  points to a commit (with commit id 65934...) that is reachable from
> -v2.6.19 but not from v2.6.18.  Compile and test it, and see whether
> +"master" but not from v2.6.18.  Compile and test it, and see whether
>  it crashes.  Assume it does crash.  Then:
>  
>  -------------------------------------------------

Thanks.

This hunk and the last hunk I do not have any problem with.

> @@ -1367,7 +1367,7 @@ If you make a commit that you later wish you hadn't, there are two
>  fundamentally different ways to fix the problem:
>  
>  	1. You can create a new commit that undoes whatever was done
> -	by the previous commit.  This is the correct thing if your
> +	by the old commit.  This is the correct thing if your
>  	mistake has already been made public.
>  
>  	2. You can go back and modify the old commit.  You should

But is this an improvement or just a churn?

> @@ -1567,8 +1567,8 @@ old history using, for example,
>  $ git log master@{1}
>  -------------------------------------------------
>  
> -This lists the commits reachable from the previous version of the head.
> -This syntax can be used to with any git command that accepts a commit,
> +This lists the commits reachable from the previous version of the branch.
> +This syntax can be used with any git command that accepts a commit,
>  not just with git log.  Some other examples:
>  
>  -------------------------------------------------

  reply	other threads:[~2007-11-14  7:20 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-11-13 18:19 [PATCH] user-manual.txt: fix a few mistakes Sergei Organov
2007-11-14  7:19 ` Junio C Hamano [this message]
2007-11-14 12:46   ` Sergei Organov
2007-11-14 18:13     ` J. Bruce Fields
2007-11-14 18:18 ` J. Bruce Fields
2007-11-14 19:42   ` Junio C Hamano
2007-11-14 19:44     ` J. Bruce Fields
2007-11-15 10:36   ` Sergei Organov
2007-11-16  3:54     ` J. Bruce Fields
2007-11-16 11:34       ` Sergei Organov

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=7vlk91mgz6.fsf@gitster.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=bfields@citi.umich.edu \
    --cc=git@vger.kernel.org \
    --cc=osv@javad.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).