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: Mon, 17 Nov 2014 18:48:56 +0200 Message-ID: <83egt1bwnb.fsf@gnu.org> References: <87k32vsm8u.fsf@wanadoo.es> <87ppcnk16n.fsf@Rainer.invalid> <83egt3dv5k.fsf@gnu.org> <87ioifuodn.fsf@engster.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1416243632 16650 80.91.229.3 (17 Nov 2014 17:00:32 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 17 Nov 2014 17:00:32 +0000 (UTC) Cc: Stromeko@nexgo.de, emacs-devel@gnu.org To: David Engster Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Nov 17 18:00: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 1XqPf6-0007ZA-Lf for ged-emacs-devel@m.gmane.org; Mon, 17 Nov 2014 18:00:24 +0100 Original-Received: from localhost ([::1]:48935 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqPf6-0005d1-9w for ged-emacs-devel@m.gmane.org; Mon, 17 Nov 2014 12:00:24 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60304) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqPUF-0002lR-TQ for emacs-devel@gnu.org; Mon, 17 Nov 2014 11:49:16 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XqPUB-0007NO-5Y for emacs-devel@gnu.org; Mon, 17 Nov 2014 11:49:11 -0500 Original-Received: from mtaout24.012.net.il ([80.179.55.180]:49861) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqPUA-0007N9-Uo for emacs-devel@gnu.org; Mon, 17 Nov 2014 11:49:07 -0500 Original-Received: from conversion-daemon.mtaout24.012.net.il by mtaout24.012.net.il (HyperSendmail v2007.08) id <0NF600I00ZLVRX00@mtaout24.012.net.il> for emacs-devel@gnu.org; Mon, 17 Nov 2014 18:41:29 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout24.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NF600I76ZP53T10@mtaout24.012.net.il>; Mon, 17 Nov 2014 18:41:29 +0200 (IST) In-reply-to: <87ioifuodn.fsf@engster.org> 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.180 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:177449 Archived-At: > From: David Engster > Cc: Achim Gratz , emacs-devel@gnu.org > Date: Sun, 16 Nov 2014 17:00:20 +0100 > > > What about "pull --rebase=preserve"? It sounds like a less radical > > option, did I miss something? > > That option only exists since Git 1.8.5 or so. But I agree that it > should be used if available, as to not accidentally flatten local merges > you want to keep (you can make it default by setting the pull.rebase > option to 'preserve' - again something that really should be the > default). Btw, those who configure Git to rebase on pull might also wish to set rebase.stat = true, so the diffstat output is still shown when they pull.