From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Richard Stallman Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Sat, 04 Apr 2015 10:48:03 -0400 Message-ID: References: <87384qzxqy.fsf@igel.home> <83bnjen71r.fsf@gnu.org> <871tk6538w.fsf@gnu.org> <838ueezgyk.fsf@gnu.org> <878ueejnjz.fsf@uwakimon.sk.tsukuba.ac.jp> <83twx2xoc8.fsf@gnu.org> <87619hke3u.fsf@uwakimon.sk.tsukuba.ac.jp> <551A3F17.6020903@math.ntnu.no> <551A59F1.3060602@math.ntnu.no> <86384lciin.fsf@dod.no> <83bnj7syd5.fsf@gnu.org> <87y4mbhnw1.fsf@gmail.com> <83wq1vrgbk.fsf@gnu.org> <87sicjggj6.fsf@gmail.com> <83ego2r2vc.fsf@gnu.org> <83lhi9phgd.fsf@gnu.org> Reply-To: rms@gnu.org NNTP-Posting-Host: plane.gmane.org Content-Type: text/plain; charset=Utf-8 X-Trace: ger.gmane.org 1428158905 17128 80.91.229.3 (4 Apr 2015 14:48:25 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 4 Apr 2015 14:48:25 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Apr 04 16:48:21 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 1YePMx-0007wl-8S for ged-emacs-devel@m.gmane.org; Sat, 04 Apr 2015 16:48:19 +0200 Original-Received: from localhost ([::1]:33316 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YePMw-0000LL-FA for ged-emacs-devel@m.gmane.org; Sat, 04 Apr 2015 10:48:18 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58065) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YePMi-0000LG-Lc for emacs-devel@gnu.org; Sat, 04 Apr 2015 10:48:05 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YePMh-0000q4-PR for emacs-devel@gnu.org; Sat, 04 Apr 2015 10:48:04 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:54877) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YePMh-0000py-Nb for emacs-devel@gnu.org; Sat, 04 Apr 2015 10:48:03 -0400 Original-Received: from rms by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1YePMh-0002AD-5G; Sat, 04 Apr 2015 10:48:03 -0400 In-reply-to: <83lhi9phgd.fsf@gnu.org> (message from Eli Zaretskii on Fri, 03 Apr 2015 14:41:22 +0300) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::e 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:184866 Archived-At: [[[ To any NSA and FBI agents reading my email: please consider ]]] [[[ whether defending the US Constitution against all enemies, ]]] [[[ foreign or domestic, requires you to follow Snowden's example. ]]] > > I always commit an entire changeset -- that's why I use vc-dir -- but > > the changeset is often not all of the files I have edited. Over a few > > weeks I may have fixed a few bugs in different files. I commit the > > different fixes separately. > Do you also push each such commit immediately, or do you wait for all > of the fixes to be ready and committed, and then push them all in one > go? I have only once tried to install changes with Git, so there is no "usual" answer. This time, I committed two or three change sets, separately. Then I think I did a pull again. > I'd suggest > to hold off your ChangeLog entries until just before you commit the > changeset, because most conflicts are caused by ChangeLog's. That's what I always do. -- Dr Richard Stallman President, Free Software Foundation 51 Franklin St Boston MA 02110 USA www.fsf.org www.gnu.org Skype: No way! See stallman.org/skype.html.