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: Messing with the VC history Date: Sat, 22 Nov 2014 11:04:18 +0100 Organization: Probably a good idea Message-ID: References: <87k32vsm8u.fsf@wanadoo.es> <87ppcnk16n.fsf@Rainer.invalid> <83egt3dv5k.fsf@gnu.org> <877fyvjear.fsf@Rainer.invalid> <83sihjc8up.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416650729 5352 80.91.229.3 (22 Nov 2014 10:05:29 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 22 Nov 2014 10:05:29 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 22 11:05:22 2014 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 1Xs7ZB-0000zf-0Z for ged-emacs-devel@m.gmane.org; Sat, 22 Nov 2014 11:05:21 +0100 Original-Received: from localhost ([::1]:44657 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xs7ZA-0006ZP-Ie for ged-emacs-devel@m.gmane.org; Sat, 22 Nov 2014 05:05:20 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50819) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xs7Z1-0006Z8-2j for emacs-devel@gnu.org; Sat, 22 Nov 2014 05:05:16 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xs7Yv-0002KN-72 for emacs-devel@gnu.org; Sat, 22 Nov 2014 05:05:11 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:32889) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xs7Yv-0002Id-0i for emacs-devel@gnu.org; Sat, 22 Nov 2014 05:05:05 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Xs7Yt-0000vV-FU for emacs-devel@gnu.org; Sat, 22 Nov 2014 11:05:03 +0100 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 ; Sat, 22 Nov 2014 11:05:03 +0100 Original-Received: from sb by cm-84.208.248.210.getinternet.no with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 22 Nov 2014 11:05:03 +0100 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.3 (windows-nt) Cancel-Lock: sha1:NnePVkWdd5HrGq+dpRGsX9Np8gk= 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:177983 Archived-At: >>>>> Eli Zaretskii : > My workflow with feature branches is create the branch; do the work; > when it's almost done, merge from master and test; then merge back > into master and push. There's no pulling here except from upstream to > master. Note: This is a very good work pattern in git, and people should consider this rather than working directly on the tracking branch and rebasing on pull.