From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthieu Moy Subject: Re: [PATCH v2] git-checkout.txt: Document "git checkout " better Date: Wed, 17 Jun 2015 13:54:13 +0200 Message-ID: References: <558127CB.70603@web.de> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: git@vger.kernel.org To: "Andres G. Aragoneses" X-From: git-owner@vger.kernel.org Wed Jun 17 13:54:24 2015 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Z5BvD-0005hm-LP for gcvg-git-2@plane.gmane.org; Wed, 17 Jun 2015 13:54:24 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753414AbbFQLyT convert rfc822-to-quoted-printable (ORCPT ); Wed, 17 Jun 2015 07:54:19 -0400 Received: from mx1.imag.fr ([129.88.30.5]:51894 "EHLO shiva.imag.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752989AbbFQLyR (ORCPT ); Wed, 17 Jun 2015 07:54:17 -0400 Received: from clopinette.imag.fr (clopinette.imag.fr [129.88.34.215]) by shiva.imag.fr (8.13.8/8.13.8) with ESMTP id t5HBsCGP015267 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 17 Jun 2015 13:54:12 +0200 Received: from anie.imag.fr (anie.imag.fr [129.88.7.32]) by clopinette.imag.fr (8.13.8/8.13.8) with ESMTP id t5HBsDxv004600; Wed, 17 Jun 2015 13:54:13 +0200 In-Reply-To: (Andres G. Aragoneses's message of "Wed, 17 Jun 2015 13:47:09 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.0.1 (shiva.imag.fr [129.88.30.5]); Wed, 17 Jun 2015 13:54:12 +0200 (CEST) X-IMAG-MailScanner-Information: Please contact MI2S MIM for more information X-MailScanner-ID: t5HBsCGP015267 X-IMAG-MailScanner: Found to be clean X-IMAG-MailScanner-SpamCheck: X-IMAG-MailScanner-From: matthieu.moy@grenoble-inp.fr MailScanner-NULL-Check: 1435146854.87561@OS40gWCDCBtAc49xBwQgTQ Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: "Andres G. Aragoneses" writes: > On 17/06/15 12:54, Matthieu Moy wrote: >> Duy Nguyen writes: >> >>> On Wed, Jun 17, 2015 at 2:54 PM, Torsten B=F6gershausen wrote: >>>> -git-checkout - Checkout a branch or paths to the working tree >>>> +git-checkout - Switch branches or restore changes >>> >>> I didn't follow closely the previous discussion. >> >> (Neither did I) >> >>> Forgive me if this is already discussed, but I would keep the "in t= he >>> working tree". "Restore changes" alone seems vague. >> >> "Restore previous version" would be better than "Restore changes" to= me. > > "previous version" sounds ambiguous. Yes, but "git checkout" can do many things. It can restore an old commited state, restore from the index, ... so we need to either be vague, or use a long enumeration. > How about "discard local changes"? To me this describes "git checkout HEAD", but neither "git checkout -- file" nor "git checkout HEAD^^^". --=20 Matthieu Moy http://www-verimag.imag.fr/~moy/