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: Messing with the VC history Date: Sun, 16 Nov 2014 17:25:59 +0200 Message-ID: <83egt3dv5k.fsf@gnu.org> References: <87k32vsm8u.fsf@wanadoo.es> <87ppcnk16n.fsf@Rainer.invalid> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE X-Trace: ger.gmane.org 1416151596 27394 80.91.229.3 (16 Nov 2014 15:26:36 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 16 Nov 2014 15:26:36 +0000 (UTC) Cc: emacs-devel@gnu.org To: Achim Gratz Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Nov 16 16:26:28 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 1Xq1ic-0000LH-QA for ged-emacs-devel@m.gmane.org; Sun, 16 Nov 2014 16:26:27 +0100 Original-Received: from localhost ([::1]:44126 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xq1ic-0002Ix-4s for ged-emacs-devel@m.gmane.org; Sun, 16 Nov 2014 10:26:26 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41742) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xq1iT-0002Hi-ND for emacs-devel@gnu.org; Sun, 16 Nov 2014 10:26:23 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xq1iN-00034e-Us for emacs-devel@gnu.org; Sun, 16 Nov 2014 10:26:17 -0500 Original-Received: from mtaout26.012.net.il ([80.179.55.182]:52044) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xq1iN-00033b-Ne for emacs-devel@gnu.org; Sun, 16 Nov 2014 10:26:11 -0500 Original-Received: from conversion-daemon.mtaout26.012.net.il by mtaout26.012.net.il (HyperSendmail v2007.08) id <0NF500G0019RKG00@mtaout26.012.net.il> for emacs-devel@gnu.org; Sun, 16 Nov 2014 17:24:37 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout26.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NF500H9R1H08G00@mtaout26.012.net.il>; Sun, 16 Nov 2014 17:24:37 +0200 (IST) In-reply-to: <87ppcnk16n.fsf@Rainer.invalid> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.182 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:177307 Archived-At: > From: Achim Gratz > Date: Sun, 16 Nov 2014 09:19:12 +0100 >=20 > =C3=93scar Fuentes writes: > > IMO we should encourage people to use fetch+rebase instead of `pu= ll', > > reserving merges for logically-related changes that comprise mult= iple > > commits. >=20 > ...or configure Git to have "git pull" do exactly that, at least fo= r the > branches that are going upstream. What about "pull --rebase=3Dpreserve"? It sounds like a less radical option, did I miss something?