From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: git apologia [was: git pull fails with merge conflicts. ...] Date: Sat, 15 Nov 2014 20:37:20 +0200 Message-ID: <83sihke2e7.fsf@gnu.org> References: <20141114183737.GB3168@acm.acm> <5466517B.50705@porkrind.org> <20141114215404.GD3168@acm.acm> <838ujchods.fsf@gnu.org> <8761egx1k2.fsf@uwakimon.sk.tsukuba.ac.jp> <83sihkg2ds.fsf@gnu.org> <87vbmgv3b9.fsf@uwakimon.sk.tsukuba.ac.jp> <834mu0flug.fsf@gnu.org> <877fywb9ro.fsf@igel.home> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1416076690 15631 80.91.229.3 (15 Nov 2014 18:38:10 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 15 Nov 2014 18:38:10 +0000 (UTC) Cc: stephen@xemacs.org, emacs-devel@gnu.org To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 15 19:38:02 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XpiET-0001ox-Nw for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 19:38:01 +0100 Original-Received: from localhost ([::1]:41575 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpiER-0001hs-9J for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 13:37:59 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37793) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpiEA-0001hm-Gv for emacs-devel@gnu.org; Sat, 15 Nov 2014 13:37:47 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XpiE4-000208-M7 for emacs-devel@gnu.org; Sat, 15 Nov 2014 13:37:42 -0500 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:37351) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpiE4-0001zw-Ds for emacs-devel@gnu.org; Sat, 15 Nov 2014 13:37:36 -0500 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0NF300900FG2NN00@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Sat, 15 Nov 2014 20:37:35 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NF3009QQFQMMR10@a-mtaout22.012.net.il>; Sat, 15 Nov 2014 20:37:35 +0200 (IST) In-reply-to: <877fywb9ro.fsf@igel.home> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.172 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 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-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:177227 Archived-At: > From: Andreas Schwab > Cc: "Stephen J. Turnbull" , emacs-devel@gnu.org > Date: Sat, 15 Nov 2014 19:26:19 +0100 > > Eli Zaretskii writes: > > > MMDNV. But the point is that I need either forget about "git diff" > > and switch to "git show" entirely, or use the former as replacement > > for the "-c COMMIT" use case, and the latter for the others. IOW, one > > more thing to re-learn, that won't serve me with any other VCS. > > You still need git diff for showing the changes in your work tree > wrt. HEAD, or the index. Right. Which is why I only use show after a commit before a push.