From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Achim Gratz Newsgroups: gmane.emacs.devel Subject: Re: git commit/push and VC Date: Thu, 20 Nov 2014 19:17:43 +0100 Organization: Linux Private Site Message-ID: <87ppchd9dk.fsf@Gertrud.fritz.box> References: <871toysqyq.fsf@rosalinde.fritz.box> <838uj57u5b.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1416507507 21505 80.91.229.3 (20 Nov 2014 18:18:27 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 20 Nov 2014 18:18:27 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 20 19:18:20 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 1XrWJ6-0004pz-6W for ged-emacs-devel@m.gmane.org; Thu, 20 Nov 2014 19:18:16 +0100 Original-Received: from localhost ([::1]:36793 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XrWJ5-0006an-Li for ged-emacs-devel@m.gmane.org; Thu, 20 Nov 2014 13:18:15 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50910) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XrWIx-0006Zc-76 for emacs-devel@gnu.org; Thu, 20 Nov 2014 13:18:13 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XrWIq-0001o2-KB for emacs-devel@gnu.org; Thu, 20 Nov 2014 13:18:07 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:59400) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XrWIq-0001ny-DJ for emacs-devel@gnu.org; Thu, 20 Nov 2014 13:18:00 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1XrWIl-0004fS-E9 for emacs-devel@gnu.org; Thu, 20 Nov 2014 19:17:55 +0100 Original-Received: from pd9eb04fd.dip0.t-ipconnect.de ([217.235.4.253]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 20 Nov 2014 19:17:55 +0100 Original-Received: from Stromeko by pd9eb04fd.dip0.t-ipconnect.de with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 20 Nov 2014 19:17:55 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 48 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: pd9eb04fd.dip0.t-ipconnect.de User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) Cancel-Lock: sha1:bsNuoa35TFbT+aobveGVXsW//A0= 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:177886 Archived-At: 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. > . 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. > . do we want to explicitly recommend 2 different clones, one each > for master and the release branch? there's nothing in the > instructions about this, or about working with 2 divergent > branches in general I've just got a new computer and it takes all of 0.6 seconds to switch from master to emacs-24. I've had a much slower one until two days ago and I don't think it took longer than about 5 seconds even there. Unless you're really working all the time in parallel on both branches I'd say this setup is more trouble than it's worth. Especially not for the folks who expect Bzr semantics from this setup… > . GitQuickStartForEmacsDevs advises to use "git ci -a"; why not > suggest the same in GitForEmacsDevs? it seems a simpler setup That is no git command. Assuming that ci is an alias for commit, then no, that is not a good recommendation in general. If the only changes you have belong to a single commit (a quick bugfix, say) then it saves a bit of typing. But if the changes should really be goign to different commits for clarity, then this is ill-advised. Again, if you use magit you can even chose which hunk of a diff goes into each commit. Regards, Achim. -- +<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+ Factory and User Sound Singles for Waldorf Q+, Q and microQ: http://Synth.Stromeko.net/Downloads.html#WaldorfSounds