From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Alan Mackenzie Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Wed, 1 Apr 2015 22:34:32 +0000 Message-ID: <20150401223432.GE2633@acm.fritz.box> References: <551A3F17.6020903@math.ntnu.no> <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> <87iodgiqr8.fsf@uwakimon.sk.tsukuba.ac.jp> <20150401123241.GB2633@acm.fritz.box> <87619feig9.fsf@mango.localdomain> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1427927714 6703 80.91.229.3 (1 Apr 2015 22:35:14 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 1 Apr 2015 22:35:14 +0000 (UTC) Cc: "Stephen J. Turnbull" , emacs-devel@gnu.org To: Ricardo Wurmus Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Apr 02 00:35:06 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 1YdRE1-0003RV-MC for ged-emacs-devel@m.gmane.org; Thu, 02 Apr 2015 00:35:05 +0200 Original-Received: from localhost ([::1]:55271 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdRE0-0002Na-UO for ged-emacs-devel@m.gmane.org; Wed, 01 Apr 2015 18:35:04 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60376) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdRDj-0002NU-5U for emacs-devel@gnu.org; Wed, 01 Apr 2015 18:34:48 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YdRDg-0003xA-8I for emacs-devel@gnu.org; Wed, 01 Apr 2015 18:34:47 -0400 Original-Received: from colin.muc.de ([193.149.48.1]:29546 helo=mail.muc.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdRDf-0003wv-Up for emacs-devel@gnu.org; Wed, 01 Apr 2015 18:34:44 -0400 Original-Received: (qmail 59481 invoked by uid 3782); 1 Apr 2015 22:34:42 -0000 Original-Received: from acm.muc.de (pD951AF7A.dip0.t-ipconnect.de [217.81.175.122]) by colin.muc.de (tmda-ofmipd) with ESMTP; Thu, 02 Apr 2015 00:34:41 +0200 Original-Received: (qmail 2539 invoked by uid 1000); 1 Apr 2015 22:34:32 -0000 Content-Disposition: inline In-Reply-To: <87619feig9.fsf@mango.localdomain> User-Agent: Mutt/1.5.23 (2014-03-12) X-Delivery-Agent: TMDA/1.1.12 (Macallan) X-Primary-Address: acm@muc.de X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x X-Received-From: 193.149.48.1 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:184763 Archived-At: Hello, Ricardo. On Wed, Apr 01, 2015 at 09:50:46PM +0200, Ricardo Wurmus wrote: > Alan Mackenzie writes: > > The only combination that makes sense to me is that which involves the > > least risk and the least time and effort wasted in ploughing through > > git's inadequate documentation. I don't want to spend several hours > > learning how to "throw away commits while keeping the changes using > > interactive rebasing", or even in learning what that all really means. I > > am one of these seemingly rare people who are not fascinated by the > > innards of git, and simply want an appropriate tool for communicating > > changes from and to savannah. I know I'm not the only one. I think you > > have trouble accepting this position. > I'm not "fascinated by the innards of git" and I don't find the man > pages very useful, but creating commits often and interactively rebasing > them before publishing (i.e. "git push") lies at the core of my > workflow, and I would not do it if it wasn't easy and convenient. Is having to invent a meaningful commit message for each and every commit not inconvenient? > Your concept of a commit as "an affirmation [...] of the value of the > new code" does not need to apply to local, "whimsical", cheap commits. > Before publishing you can *easily* squash, delete, edit, rename, move > commits with interactive rebase. You can defer the decision when > something is ready for publication without having to forgo commits (I > think of them as "quicksave" in games). > Committing often and rebasing for publication are both cheap operations > with little mental overhead. It would be insanity for me to keep a > dirty working directory with potentially valuable changes uncommitted. Why "insane"? Do you have your repository in a "more secure" place? For me, my repository is on the same RAID pair of disks as my working directory. So committing things in my working directory doesn't make them any more secure. I don't do it because it would be extra work, however little. As you intimate above, these extra commits would need to be dealt with by squashing, deleting, editing, renaming, interactive rebasing, or whatever. I honestly don't understand why people advocate frequent committing. > ~~ Ricardo -- Alan Mackenzie (Nuremberg, Germany).