From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sergei Organov Subject: Re: [PATCH] user-manual.txt: fix a few mistakes Date: Wed, 14 Nov 2007 15:46:32 +0300 Message-ID: <87ir455713.fsf@osv.gnss.ru> References: <87bq9x7w4d.fsf@osv.gnss.ru> <7vlk91mgz6.fsf@gitster.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: git@vger.kernel.org, J Bruce Fields To: Junio C Hamano X-From: git-owner@vger.kernel.org Wed Nov 14 13:48:01 2007 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1IsHer-0002uU-MP for gcvg-git-2@gmane.org; Wed, 14 Nov 2007 13:47:54 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754771AbXKNMrN (ORCPT ); Wed, 14 Nov 2007 07:47:13 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754813AbXKNMrN (ORCPT ); Wed, 14 Nov 2007 07:47:13 -0500 Received: from javad.com ([216.122.176.236]:2986 "EHLO javad.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754771AbXKNMrL (ORCPT ); Wed, 14 Nov 2007 07:47:11 -0500 Received: from osv ([87.236.81.130]) by javad.com (8.11.6/8.11.0) with ESMTP id lAECkd068094; Wed, 14 Nov 2007 12:46:44 GMT (envelope-from s.organov@javad.com) Received: from osv by osv with local (Exim 4.63) (envelope-from ) id 1IsHdY-0007GO-9T; Wed, 14 Nov 2007 15:46:32 +0300 In-Reply-To: <7vlk91mgz6.fsf@gitster.siamese.dyndns.org> (Junio C. Hamano's message of "Tue\, 13 Nov 2007 23\:19\:41 -0800") User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.1 (gnu/linux) Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: Junio C Hamano writes: > Sergei Organov writes: > >> Signed-off-by: Sergei Organov >> --- >> 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? I believe this is an improvement. It's more precise. With this change it's crystal clear that both (1) and (2) above mean the same commit by calling it "the old commit". Before the change, when I read this the first time, I've got the term "previous" here literally, i.e., as the last commit made, and I thought that if the commit in question is the last one, I should do (1), otherwise -- (2). This confusion admittedly vanished rather quickly, but it did happen. If I didn't manage to express my first impression clearly (English is not my mothers' tongue), try to read this to get similar impression: 1. You can create a new commit that undoes whatever was done by the previous commit. 2. You can go back and modify the old commit. Do you see the problem? -- Sergei.