From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Steinar Bang Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Tue, 31 Mar 2015 16:47:31 +0200 Organization: Probably a good idea Message-ID: <867ftxcjgc.fsf@dod.no> References: <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> <20150331085055.GA2871@acm.fritz.box> <87zj6tiko1.fsf@uwakimon.sk.tsukuba.ac.jp> <20150331104935.GB2871@acm.fritz.box> <86ego5qoj1.fsf@example.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1427813275 5028 80.91.229.3 (31 Mar 2015 14:47:55 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 31 Mar 2015 14:47:55 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 31 16:47:48 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 1YcxSC-0005Vq-8H for ged-emacs-devel@m.gmane.org; Tue, 31 Mar 2015 16:47:44 +0200 Original-Received: from localhost ([::1]:39062 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcxSB-0001J2-Jq for ged-emacs-devel@m.gmane.org; Tue, 31 Mar 2015 10:47:43 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58046) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcxS5-0001Iu-Ea for emacs-devel@gnu.org; Tue, 31 Mar 2015 10:47:41 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YcxS2-0001Vl-EE for emacs-devel@gnu.org; Tue, 31 Mar 2015 10:47:37 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:51212) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcxS2-0001VZ-7o for emacs-devel@gnu.org; Tue, 31 Mar 2015 10:47:34 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1YcxRs-0005Dg-Cc for emacs-devel@gnu.org; Tue, 31 Mar 2015 16:47:24 +0200 Original-Received: from cm-84.208.248.210.getinternet.no ([84.208.248.210]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 31 Mar 2015 16:47:24 +0200 Original-Received: from sb by cm-84.208.248.210.getinternet.no with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 31 Mar 2015 16:47:24 +0200 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 9 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: cm-84.208.248.210.getinternet.no Mail-Copies-To: never User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/24.4 (windows-nt) Cancel-Lock: sha1:gNkyl5KqO7dTkeFPkvm+WYSu//w= 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:184641 Archived-At: >>>>> Sebastien Vauban : > Are there other (more elegant, or more clever) ways to deal with that > situation (fetching something someone has fixed without committing > we're not yet ready to commit and push on master)? Well, one way would be not to work directly on master, but instead work on a feature branch, and only merge in the feature branch when you're ready to commit.