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 commit/push and VC Date: Sat, 22 Nov 2014 12:30:27 +0200 Message-ID: <831tovttmk.fsf@gnu.org> References: <871toysqyq.fsf@rosalinde.fritz.box> <838uj57u5b.fsf@gnu.org> <87ppchd9dk.fsf@Gertrud.fritz.box> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1416652264 26185 80.91.229.3 (22 Nov 2014 10:31:04 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 22 Nov 2014 10:31:04 +0000 (UTC) Cc: emacs-devel@gnu.org To: Achim Gratz Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 22 11:30:57 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 1Xs7xv-0007qk-Mk for ged-emacs-devel@m.gmane.org; Sat, 22 Nov 2014 11:30:55 +0100 Original-Received: from localhost ([::1]:44909 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xs7xu-0001LL-U2 for ged-emacs-devel@m.gmane.org; Sat, 22 Nov 2014 05:30:54 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:54000) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xs7xY-0001LD-VP for emacs-devel@gnu.org; Sat, 22 Nov 2014 05:30:38 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xs7xT-0000AH-6s for emacs-devel@gnu.org; Sat, 22 Nov 2014 05:30:32 -0500 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:35039) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xs7xS-0000AB-Qh for emacs-devel@gnu.org; Sat, 22 Nov 2014 05:30:27 -0500 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0NFF00G00RGERB00@a-mtaout20.012.net.il> for emacs-devel@gnu.org; Sat, 22 Nov 2014 12:30:25 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NFF00GVWRUORV00@a-mtaout20.012.net.il>; Sat, 22 Nov 2014 12:30:25 +0200 (IST) In-reply-to: <87ppchd9dk.fsf@Gertrud.fritz.box> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.166 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:177986 Archived-At: > From: Achim Gratz > Date: Thu, 20 Nov 2014 19:17:43 +0100 > > Eli Zaretskii writes: > > There are still issues that I'd like to be sure about before I fix > > them. Would people please comment on these: > > > > . the instructions say that a "git commit" is necessary even when > > the merge is without conflicts, which AFAIK is incorrect with Git > > In standard configuration a non-conflicted merge will be auto-committed, > yes. As always, that default can be configured to instead stop before > the commit. OK, so if we are going to recommend to use "commit -a" (and actually we already do, see the Wiki), then I guess "git add" after resolving merge conflicts is also not necessary, right? That is, instead of this: git merge master # resolve conflicts git add file-you-changed git commit -m "Merge from mainline." we should recommend this: git merge master # resolve conflicts git commit -a -m "Merge from mainline." Is that correct? > > . do we want to tell there that "pull --rebase" is recommended? that > > would solve some of the issues the instructions are forced to > > explain in so many words, which unnecessarily complicates them > > I'm still in favor of configuring that preference, rather than asking > for options to be added to each command. Yes, of course. Thanks.