From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Kastrup Newsgroups: gmane.emacs.devel Subject: Re: git apologia [was: git pull fails with merge conflicts. ...] Date: Sat, 15 Nov 2014 19:47:39 +0100 Organization: Organization?!? Message-ID: <87oas8l2r8.fsf@fencepost.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> <83sihke2e7.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416077306 24745 80.91.229.3 (15 Nov 2014 18:48:26 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 15 Nov 2014 18:48:26 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 15 19:48:19 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 1XpiOO-0001Lo-Vu for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 19:48:17 +0100 Original-Received: from localhost ([::1]:41602 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpiOO-0004vk-JZ for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 13:48:16 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39442) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpiO8-0004v2-1G for emacs-devel@gnu.org; Sat, 15 Nov 2014 13:48:04 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XpiO3-0004Yl-56 for emacs-devel@gnu.org; Sat, 15 Nov 2014 13:47:59 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:32832) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpiO2-0004Ye-Ui for emacs-devel@gnu.org; Sat, 15 Nov 2014 13:47:55 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1XpiO0-0007p6-4d for emacs-devel@gnu.org; Sat, 15 Nov 2014 19:47:52 +0100 Original-Received: from x2f516dd.dyn.telefonica.de ([2.245.22.221]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 15 Nov 2014 19:47:52 +0100 Original-Received: from dak by x2f516dd.dyn.telefonica.de with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 15 Nov 2014 19:47:52 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 31 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: x2f516dd.dyn.telefonica.de X-Face: 2FEFf>]>q>2iw=B6, xrUubRI>pR&Ml9=ao@P@i)L:\urd*t9M~y1^:+Y]'C0~{mAl`oQuAl \!3KEIp?*w`|bL5qr,H)LFO6Q=qx~iH4DN; i"; /yuIsqbLLCh/!U#X[S~(5eZ41to5f%E@'ELIi$t^ Vc\LWP@J5p^rst0+('>Er0=^1{]M9!p?&:\z]|;&=NP3AhB!B_bi^]Pfkw User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) Cancel-Lock: sha1:c/iRqLe0EOJSr3vVGrl1ac0zFQw= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 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:177230 Archived-At: Eli Zaretskii writes: >> 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. My most common use is git show :VERSION since LilyPond keeps its current version number in ./VERSION. That way, once I figure out that commit was responsible for fixing a particular bug, I can then post "this was fixed in version xx.xx.xx with commit > " -- David Kastrup