From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Yuri Khan Newsgroups: gmane.emacs.devel Subject: Re: git question Date: Wed, 27 Jun 2018 21:23:49 +0700 Message-ID: References: NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Trace: blaine.gmane.org 1530109361 30517 195.159.176.226 (27 Jun 2018 14:22:41 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 27 Jun 2018 14:22:41 +0000 (UTC) Cc: Emacs developers To: brandelune@gmail.com Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Jun 27 16:22:37 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 1fYBLA-0007qP-F7 for ged-emacs-devel@m.gmane.org; Wed, 27 Jun 2018 16:22:36 +0200 Original-Received: from localhost ([::1]:59628 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYBNH-0004ED-To for ged-emacs-devel@m.gmane.org; Wed, 27 Jun 2018 10:24:47 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45525) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYBMY-0004AG-L1 for emacs-devel@gnu.org; Wed, 27 Jun 2018 10:24:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fYBMX-0000gP-RF for emacs-devel@gnu.org; Wed, 27 Jun 2018 10:24:02 -0400 Original-Received: from mail-oi0-x22c.google.com ([2607:f8b0:4003:c06::22c]:46034) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fYBMX-0000fi-Kx for emacs-devel@gnu.org; Wed, 27 Jun 2018 10:24:01 -0400 Original-Received: by mail-oi0-x22c.google.com with SMTP id 188-v6so2013318oid.12 for ; Wed, 27 Jun 2018 07:24:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=JLBJxT4nLjj5+AWniBvdGSWEYHgmTjHsvyOKxRXBRag=; b=fLeKa8puZLdVnKnzZl70GmOachVGyKgX0VMaXsmoHRhcKd2/DRUVf7EChe+JQ1O4cU tNUpBsKKKjVP+xqgI0124qvDsInv9z+P1mLqVPh1FIrTTNLPr0CMeGmLGHReQgXDREsU JdjanYIJIeIY2FHbR5VdeviUkB0lKOqt9tVA3Q4LtPkaWNXCDNrknDEZiCuoVOr/6yve 1mut7P5hR5uYkeL/zPnu+kDXKPNfnBF5IMmYKpo8IiANx6FBdEOo8YVcgJyamNJvi1DX 6BcwjC3jKWBQ36CyCOf017iQet4A3IQ2SIrq7p6+76iHMBuYr2rFubNWJFHPjZPZcT6h 2Ylw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=JLBJxT4nLjj5+AWniBvdGSWEYHgmTjHsvyOKxRXBRag=; b=gzxReQUxXec3yy/N2JskKcRuU1gY+iEUM1o5sLj96U0eSkaG+ASL875m38zyugbs2L z8shL8d7LPe8wRBudkeOxdIwnjgZBktTIC9m0x9j/nNceHK5voErMpOFjU6leDfXjE+9 qO2DIO4vmX4JaEwpaTN8sRDH77wJNVVO5FRPP7/VugpYUjC5Fh6ZzVQc//x1hC4djB4B o1C8s+RZsDbuxFJBQKt4ihBJdlnAegEvWy7FdOfp51jHQW0nGx9JgKoTLCj/phNwxTXv /GesX/nW+3U4Ba3Rou/byi/ez1Vul5z38LuNTM1AW0G7hHEqpHqil9wCE6CLMyeEuuHG yMdA== X-Gm-Message-State: APt69E3nwtird7Q5QoWbYYmuQ2LzxIa6ZJpRUVCYTCEZ5Iasv/JwEEDh NGCA7Tf9pURLrn6VS2RGYS+eNfC4MwpBwvzc060= X-Google-Smtp-Source: AAOMgpcumo5ovzMxTF/ipXFIqSyF4W5RSLWUDz0SmFA7MFS853YqA5lAspOl1Te8TxlKE6h6w5h2pyGaH6Cm4KeVX+M= X-Received: by 2002:aca:e5d2:: with SMTP id c201-v6mr3586985oih.191.1530109441008; Wed, 27 Jun 2018 07:24:01 -0700 (PDT) In-Reply-To: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4003:c06::22c 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:226772 Archived-At: On Wed, Jun 27, 2018 at 9:03 PM Jean-Christophe Helary wrote: > When I do a git pull and I get, for ex: > > etc/NEWS | 6 ++++++ > lisp/info.el | 4 ++-- > lisp/server.el | 10 ++++++---- > > like I just had. > > What git command should I use to examine what are the modifications on th= e three above files? Normally you would first do a =E2=80=9Cgit fetch=E2=80=9D, then see the dif= f between current state and the remote branch, and only then decide if you want to merge that: $ git fetch $ git diff HEAD..origin/master $ git merge origin/master (substitute a different remote branch name as necessary). But if you did a blind pull already, you can look back this way: $ git diff HEAD@{1}..