From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Achim Gratz Newsgroups: gmane.emacs.devel Subject: Re: Messing with the VC history Date: Sun, 16 Nov 2014 17:33:32 +0100 Organization: Linux Private Site Message-ID: <877fyvjear.fsf@Rainer.invalid> References: <87k32vsm8u.fsf@wanadoo.es> <87ppcnk16n.fsf@Rainer.invalid> <83egt3dv5k.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416155671 23604 80.91.229.3 (16 Nov 2014 16:34:31 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 16 Nov 2014 16:34:31 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Nov 16 17:34:25 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 1Xq2mO-00084y-S3 for ged-emacs-devel@m.gmane.org; Sun, 16 Nov 2014 17:34:24 +0100 Original-Received: from localhost ([::1]:44318 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xq2mO-0007oK-GK for ged-emacs-devel@m.gmane.org; Sun, 16 Nov 2014 11:34:24 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:53184) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xq2lx-0007dk-LP for emacs-devel@gnu.org; Sun, 16 Nov 2014 11:34:03 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xq2lr-0006n9-EB for emacs-devel@gnu.org; Sun, 16 Nov 2014 11:33:57 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:54099) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xq2lr-0006n3-8f for emacs-devel@gnu.org; Sun, 16 Nov 2014 11:33:51 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Xq2lk-0007lu-BX for emacs-devel@gnu.org; Sun, 16 Nov 2014 17:33:44 +0100 Original-Received: from pd9eb3aa3.dip0.t-ipconnect.de ([217.235.58.163]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 16 Nov 2014 17:33:44 +0100 Original-Received: from Stromeko by pd9eb3aa3.dip0.t-ipconnect.de with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 16 Nov 2014 17:33:44 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 27 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: pd9eb3aa3.dip0.t-ipconnect.de User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4.51 (gnu/linux) Cancel-Lock: sha1:YcMWBTf8m6XhD6gbv13S6ESZyJc= 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:177321 Archived-At: Eli Zaretskii writes: >> ...or configure Git to have "git pull" do exactly that, at least for the >> branches that are going upstream. > > What about "pull --rebase=preserve"? It sounds like a less radical > option, did I miss something? Yes, you can do that if you use an up-to-date Git version. Not everyone involved here is using a new enough version to use the "preserve" option (and yes, you can configure that on a global, local or branch-by-branch basis too) I have gathered from the discussions so far. For the usual "let's fix this thing and get it upstream" type of work it shouldn't matter. Otherwise you'll have to remember to configure your feature branches differently if they contain merges (local merges that is, because merges with upstream wouldn't enter into the branch if you rebase by default). For longer term work that's kept in feature branches I prefer to rebase on top of upstream rather than merge and usually do a full rewrite before pushing it upstream as well. Regards, Achim. -- +<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+ SD adaptation for Waldorf microQ V2.22R2: http://Synth.Stromeko.net/Downloads.html#WaldorfSDada