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: VC mode and git Date: Sat, 04 Apr 2015 18:12:27 +0300 Message-ID: <83wq1snd0k.fsf@gnu.org> References: <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> <86bnj59rjj.fsf@dod.no> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1428160366 7787 80.91.229.3 (4 Apr 2015 15:12:46 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 4 Apr 2015 15:12:46 +0000 (UTC) Cc: sb@dod.no, emacs-devel@gnu.org To: rms@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Apr 04 17:12:38 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 1YePkS-0007hy-AQ for ged-emacs-devel@m.gmane.org; Sat, 04 Apr 2015 17:12:36 +0200 Original-Received: from localhost ([::1]:33386 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YePkR-0004rx-LL for ged-emacs-devel@m.gmane.org; Sat, 04 Apr 2015 11:12:35 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33675) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YePkO-0004re-O3 for emacs-devel@gnu.org; Sat, 04 Apr 2015 11:12:33 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YePkK-0000J7-F8 for emacs-devel@gnu.org; Sat, 04 Apr 2015 11:12:32 -0400 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:62511) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YePkK-0000Iz-7H; Sat, 04 Apr 2015 11:12:28 -0400 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0NMA00700FIWLA00@a-mtaout22.012.net.il>; Sat, 04 Apr 2015 18:12:27 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NMA00785FKQIO40@a-mtaout22.012.net.il>; Sat, 04 Apr 2015 18:12:27 +0300 (IDT) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.172 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:184868 Archived-At: > Date: Sat, 04 Apr 2015 10:46:37 -0400 > From: Richard Stallman > Cc: emacs-devel@gnu.org > > > If this is your work pattern, you should commit all of your changesets > > before attempting a push. > > Sometimes I have changes that should be installed, and other changes > in other files that are not ready for installation. With vc-dir, that > has been easy to do. How can I handle that with Git? The same you did with CVS: just pull. In most cases, this should "just work". It might fail if there are conflicts with stuff you pull from upstream, in which case you should resolve the conflicts (like you did with CVS). Steinar's advice is valid, because having your changes committed locally makes the probability that you will lose them in some rare situations lower (or maybe zero). So you should try committing locally what you feel is ready to be committed. But it shouldn't be fatal if you don't. I tried to make the instructions about this simpler and more clear, please see http://www.emacswiki.org/emacs/GitQuickStartForEmacsDevs, I'd appreciate your comments about the new version.