From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Jean-Christophe Helary Newsgroups: gmane.emacs.devel Subject: Re: git question Date: Thu, 28 Jun 2018 00:10:25 +0900 Message-ID: References: <65501B2A-5D6A-43AF-9D2A-13789488102D@gmail.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 (Mac OS X Mail 11.4 \(3445.8.2\)) Content-Type: multipart/alternative; boundary="Apple-Mail=_1937A490-EE78-479C-973F-F9FA3CED2498" X-Trace: blaine.gmane.org 1530112119 30390 195.159.176.226 (27 Jun 2018 15:08:39 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 27 Jun 2018 15:08:39 +0000 (UTC) Cc: EMACS devel list To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Jun 27 17:08:35 2018 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fYC3f-0007np-0D for ged-emacs-devel@m.gmane.org; Wed, 27 Jun 2018 17:08:35 +0200 Original-Received: from localhost ([::1]:59920 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYC5l-00020d-UD for ged-emacs-devel@m.gmane.org; Wed, 27 Jun 2018 11:10:45 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59829) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYC5Z-0001yz-SP for emacs-devel@gnu.org; Wed, 27 Jun 2018 11:10:35 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fYC5X-0008Bn-6w for emacs-devel@gnu.org; Wed, 27 Jun 2018 11:10:33 -0400 Original-Received: from mail-pf0-x233.google.com ([2607:f8b0:400e:c00::233]:36364) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fYC5W-0008Ag-UD for emacs-devel@gnu.org; Wed, 27 Jun 2018 11:10:31 -0400 Original-Received: by mail-pf0-x233.google.com with SMTP id u16-v6so1112718pfh.3 for ; Wed, 27 Jun 2018 08:10:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:message-id:mime-version:subject:date:in-reply-to:cc:to :references; bh=/z6uySLWdevjls2T9u92lSUHACtYvbPwhpqQdDzj9Jk=; b=D0FtmwWwrnoLH6YmZ9sp/cj6rTDu1MURBZQfwaCTxNa7dFDocaKYtcp0uDaaCSflot 4EVGVrOmdXQ1wsP+9QO0bsrVJ7jhTqFeXsYaEtTou+d49fXOId5p4tNUo4QOK+2ddEO3 CslxhfjjfzTT2Wq4t05jMByEHGnxOinW7mguf+cTaBEG1EXDtWDjUfo0reKLOJ7h2PAY 5/kU6dnIgsTv8t+f7p4HU4oXy2Dd4zO+rizRJ0A7ElhksWg9mz4PzCqjh0QJApp4bfFy kS51oLlmWOR95grm7w324CpK8hLhrect7bKgkXYILrHWrgSuRoIKSZh2whQ7CedXAo4Y EalA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:message-id:mime-version:subject:date :in-reply-to:cc:to:references; bh=/z6uySLWdevjls2T9u92lSUHACtYvbPwhpqQdDzj9Jk=; b=cjPtDrGdSYQUFYWA84BrxbhfU09AuG1T1EIfddpvnLxPQuguZ31k3EnV7zDKcjq9s5 bG3/JaOJsIt1Tth4R8Gh6n1mL7Fh+r8Hxi9vsoSVoGyo19QP4CQfdXNjb6qtnoR754i3 N22xULOtnzAKd18wReYDrSBaJLsax8JZnYmVvOnWNzYif3gxIVYsFrPwVo2SSjEx19Kp i7hOMY8e4G1PnW3HM3dohq6QbvucVb8dg6e5iOaDrkXHmHT9gLtFPyJ6/5KcXyOtd7Jb NnJYf+Pwo0W6vZZuyUzM+O42XItM5Im9chCbBnvOj6uelXJXNk9idD6DY6B8U7hyG+Oy FgjQ== X-Gm-Message-State: APt69E1MmAGCa+E5YoIyib15UTYu9xookIMKIYfUM2tUtdQzIqevsZdD /LwvS98r3jVkkTMRcrKeaz0= X-Google-Smtp-Source: ADUXVKKTJegcjqNeGA7UchGkrD/wtKbs0Xx0Tp1p6W9JwLRRPfIgmsWxxba8PJETWeGPmx186nbUog== X-Received: by 2002:a63:186:: with SMTP id 128-v6mr5461453pgb.138.1530112230084; Wed, 27 Jun 2018 08:10:30 -0700 (PDT) Original-Received: from [192.168.1.7] (pl31219.ag0304.nttpc.ne.jp. [111.89.224.243]) by smtp.gmail.com with ESMTPSA id e17-v6sm6816014pgo.70.2018.06.27.08.10.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Jun 2018 08:10:28 -0700 (PDT) In-Reply-To: X-Mailer: Apple Mail (2.3445.8.2) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::233 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:226782 Archived-At: --Apple-Mail=_1937A490-EE78-479C-973F-F9FA3CED2498 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii > On Jun 28, 2018, at 0:05, Andreas Schwab wrote: >=20 > On Jun 28 2018, Jean-Christophe Helary wrote: >=20 >>> On Jun 27, 2018, at 23:19, Andreas Schwab wrote: >>=20 >>> $ git diff HEAD@{1} >>>=20 >>> shows the difference between HEAD and the previous state of HEAD. >>=20 >> So when I do >> git diff HEAD@{2} >>=20 >> I get the result vs the state of HEAD 2 "git pull" before on my = machine, right ? >=20 > Depends on what you did inbetween. See git-reflog(1). Excellent. Thank you ! " For example, HEAD@{2} means "where HEAD used to be two moves ago", master@{one.week.ago} means "where master used to point to one = week ago in this local repository", and so on. See gitrevisions(7) for more details. " Jean-Christophe Helary ----------------------------------------------- http://mac4translators.blogspot.com @brandelune --Apple-Mail=_1937A490-EE78-479C-973F-F9FA3CED2498 Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=us-ascii

On Jun 28, 2018, at 0:05, Andreas Schwab <schwab@suse.de> = wrote:

On Jun 28 2018, Jean-Christophe Helary <brandelune@gmail.com> wrote:

On Jun 27, 2018, at 23:19, Andreas Schwab <schwab@suse.de> = wrote:

$ git diff HEAD@{1}

shows the = difference between HEAD and the previous state of HEAD.

So when I do
git = diff HEAD@{2}

I get the result vs the state = of HEAD 2 "git pull" before on my machine, right ?

Depends on what you did = inbetween.  See git-reflog(1).

Excellent. Thank you !

" For example, HEAD@{2} means "where = HEAD used to be two moves ago",
      =  master@{one.week.ago} means "where master used to point to = one week ago in this local
      =  repository", and so on. See gitrevisions(7) for more details. = "


Jean-Christophe Helary
-----------------------------------------------
http://mac4translators.blogspot.com @brandelune


= --Apple-Mail=_1937A490-EE78-479C-973F-F9FA3CED2498--