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: Fri, 03 Apr 2015 09:05:34 +0200 Organization: Probably a good idea Message-ID: <86y4m9adz5.fsf@dod.no> References: <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> <87y4mdi7tj.fsf@uwakimon.sk.tsukuba.ac.jp> <20150331214347.GH2871@acm.fritz.box> <87iodgiqr8.fsf@uwakimon.sk.tsukuba.ac.jp> <20150401123241.GB2633@acm.fritz.box> <83h9syr3ac.fsf@gnu.org> <551DB570.4070908@dancol.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1428045025 21132 80.91.229.3 (3 Apr 2015 07:10:25 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 3 Apr 2015 07:10:25 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Apr 03 09:10:17 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 1Ydvk7-0005hi-KW for ged-emacs-devel@m.gmane.org; Fri, 03 Apr 2015 09:10:15 +0200 Original-Received: from localhost ([::1]:32833 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ydvk6-0006x8-LS for ged-emacs-devel@m.gmane.org; Fri, 03 Apr 2015 03:10:14 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:38742) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ydvjz-0006uu-RZ for emacs-devel@gnu.org; Fri, 03 Apr 2015 03:10:11 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ydvjw-00084l-K0 for emacs-devel@gnu.org; Fri, 03 Apr 2015 03:10:07 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:54001) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ydvjw-00083T-E9 for emacs-devel@gnu.org; Fri, 03 Apr 2015 03:10:04 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Ydvjv-0005YL-6m for emacs-devel@gnu.org; Fri, 03 Apr 2015 09:10:03 +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 ; Fri, 03 Apr 2015 09:10:03 +0200 Original-Received: from sb by cm-84.208.248.210.getinternet.no with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 03 Apr 2015 09:10:03 +0200 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 10 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:vfZSxMKWcU0Z6igUWQzDYaV3ev4= 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:184810 Archived-At: >>>>> Daniel Colascione : > When I develope a major new feature, it's usually because I'm > scratching some personal itch. I want to take advantage of whatever > the feature provides while I develop it. I also want to use the latest > bugfixes and unrelated features from Emacs trunk. Regularly rebasing > my feature work on top of trunk is the best way to accomplish both > goals. Why do you rebase from master instead of merge from master?