From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: git apologia [was: git pull fails with merge conflicts. ...] Date: Sat, 15 Nov 2014 19:26:19 +0100 Message-ID: <877fywb9ro.fsf@igel.home> 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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416076052 6749 80.91.229.3 (15 Nov 2014 18:27:32 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 15 Nov 2014 18:27:32 +0000 (UTC) Cc: "Stephen J. Turnbull" , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 15 19:27:23 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 1Xpi49-00023Q-Hv for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 19:27:21 +0100 Original-Received: from localhost ([::1]:41557 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xpi49-0007gY-5D for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 13:27:21 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36032) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xpi3N-00071W-Mq for emacs-devel@gnu.org; Sat, 15 Nov 2014 13:26:38 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xpi3I-0007EK-D8 for emacs-devel@gnu.org; Sat, 15 Nov 2014 13:26:33 -0500 Original-Received: from mail-out.m-online.net ([212.18.0.10]:55364) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xpi3C-0007Bp-9V; Sat, 15 Nov 2014 13:26:22 -0500 Original-Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3jg4kN4nrNz3hjWf; Sat, 15 Nov 2014 19:26:20 +0100 (CET) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3jg4kN41g0zvh2L; Sat, 15 Nov 2014 19:26:20 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Original-Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.68]) (amavisd-new, port 10024) with ESMTP id VQZ5AooKQ6W0; Sat, 15 Nov 2014 19:26:19 +0100 (CET) X-Auth-Info: SwCX0+5yrDGxhNDqz5fQNsIHNb6WthbsLfE7wJCFrnKz40jsYkWyVL73l69ffFUV Original-Received: from igel.home (ppp-93-104-152-230.dynamic.mnet-online.de [93.104.152.230]) by mail.mnet-online.de (Postfix) with ESMTPA; Sat, 15 Nov 2014 19:26:19 +0100 (CET) Original-Received: by igel.home (Postfix, from userid 1000) id 83DEC2C2513; Sat, 15 Nov 2014 19:26:19 +0100 (CET) X-Yow: Is it clean in other dimensions? In-Reply-To: <834mu0flug.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 15 Nov 2014 18:51:51 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 212.18.0.10 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:177226 Archived-At: 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. git show is about showing the contents of an object, be it a commit or a tree or a blob. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."