From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: martin rudalics Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Wed, 08 Apr 2015 09:05:05 +0200 Message-ID: <5524D321.1080300@gmx.at> References: <83twx2xoc8.fsf@gnu.org> <20150331085055.GA2871@acm.fritz.box> <87zj6tiko1.fsf@uwakimon.sk.tsukuba.ac.jp> <20150331104935.GB2871@acm.fritz.box> <87y4mdi7tj.fsf@uwakimon.sk.tsukuba.ac.jp> <20150331214347.GH2871@acm.fritz.box> <20150401103225.GA2633@acm.fritz.box> <87h9t080gx.fsf@javad.com> <83384jsx3o.fsf@gnu.org> <83pp7nrfdn.fsf@gnu.org> <83a8yqr226.fsf@gnu.org> <831tk2qvz5.fsf@gnu.org> <87384ii26v.fsf@uwakimon.sk.tsukuba.ac.jp> <83wq1tptvp.fsf@gnu.org> <87pp7lhc9h.fsf@uwakimon.sk.tsukuba.ac.jp> <83sichpqe9.fsf@gnu.org> <87ioddglu6.fsf@uwakimon.sk.tsukuba.ac.jp> <83a8yoq56m.fsf@gnu.org> <87384ghm1a.fsf@uwakimon.sk.tsukuba.ac.jp> <837ftspcis.fsf@gnu.org> <551FA115.5090400@gmx.at> <834mowp7cj.fsf@gnu.org> <55200A71.9040902@gmx.at> <83oan3onki.fsf@gnu.org> <55229F01.6030002@gmx.at> <837ftnj258.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1428476757 27650 80.91.229.3 (8 Apr 2015 07:05:57 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 8 Apr 2015 07:05:57 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Apr 08 09:05:49 2015 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 1Yfk3Y-0006vD-HE for ged-emacs-devel@m.gmane.org; Wed, 08 Apr 2015 09:05:48 +0200 Original-Received: from localhost ([::1]:51012 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yfk3X-00086G-Nc for ged-emacs-devel@m.gmane.org; Wed, 08 Apr 2015 03:05:47 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37913) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yfk33-000867-I5 for emacs-devel@gnu.org; Wed, 08 Apr 2015 03:05:19 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yfk32-0007gr-JD for emacs-devel@gnu.org; Wed, 08 Apr 2015 03:05:17 -0400 Original-Received: from mout.gmx.net ([212.227.17.20]:53776) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yfk2x-0007gB-Og; Wed, 08 Apr 2015 03:05:11 -0400 Original-Received: from [88.117.118.155] ([88.117.118.155]) by mail.gmx.com (mrgmx101) with ESMTPSA (Nemesis) id 0Man6U-1Z01p13wEM-00KRvQ; Wed, 08 Apr 2015 09:05:10 +0200 In-Reply-To: <837ftnj258.fsf@gnu.org> X-Provags-ID: V03:K0:QvFawHF8ZmmARY6i4sMCkLLOTqGRITjUXxI4018xdxo/zvvZN/0 S1G4+pG8mfDUdga3vGbAExeh0DzsN6cWjhJ2ZMLN5GTSIKIbc7RdAZtDacdHa4gNlM667Ak wwY29tVxO1/JvQKsXedz/B6UgKhdt7jL9HjWc0QZkn5iNIrJIQHU8bfDFo3Bal8LYXJey2q TwhNVkagdsRv1Ou59DcNg== X-UI-Out-Filterresults: notjunk:1; X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 212.227.17.20 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:185138 Archived-At: >> It is a good idea to examine what you are about to push, before >> actually doing so, because fixing mistakes before pushing is much >> easier (see the next section). To do that, use the command git diff >> origin/master. If you want to show your unpushed commits with their >> commit log messages, use git show origin/master.. instead. If you only >> have one local commit you want to push, just git show is enough. >> >> And here I would try to tell that the outputs of plain 'git diff' and >> 'git status' are different from their outputs before the commit. > > In the new version, "git diff" is no longer mentioned, Hmm... I still see We recommend invoking git status and git diff to view the changes which will be committed, before invoking git commit -a. > and "git > status" was never mentioned before, so do you still think we need to > say something about that? Maybe it's only me. git adopts a principle epitomized by, for example, Typically you would want comparison with the latest commit, so if you do not give , it defaults to HEAD. which is completely unintuitive IMO. Why should the output of two "git diff"s differ just because I committed something in between? > But the full text says this: > > This merge could fail due to conflicts between your changes and > changes by others in the same portions of the same files. The > conflicts could be in changes you have already committed locally, or > in uncommitted changes. > > The second sentence refers to uncommitted changes. Is it really > important to tell that in this case Git will not even start a merge? > How will that help the reader/user when they are in this situation? Agreed. One nitpick still: Now you have conflicts due to local committed changes, described below. I would say Now you may have conflicts due to local committed changes, described below. instead. >> Are we really 100% sure that 'git add' gets executed with all reasonable >> user customizations? > > As long as they didn't remove the Git back-end from the list, yes. It wasn't entirely clear for me but I take your word for it. Thanks again for taking care of this, martin