From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Engster Newsgroups: gmane.emacs.devel Subject: Re: Messing with the VC history Date: Sun, 16 Nov 2014 17:00:20 +0100 Message-ID: <87ioifuodn.fsf@engster.org> 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; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1416153647 25375 80.91.229.3 (16 Nov 2014 16:00:47 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 16 Nov 2014 16:00:47 +0000 (UTC) Cc: Achim Gratz , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Nov 16 17:00:41 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 1Xq2Fj-00046m-HJ for ged-emacs-devel@m.gmane.org; Sun, 16 Nov 2014 17:00:39 +0100 Original-Received: from localhost ([::1]:44215 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xq2Fj-0004Tk-7t for ged-emacs-devel@m.gmane.org; Sun, 16 Nov 2014 11:00:39 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47306) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xq2FZ-0004SP-R7 for emacs-devel@gnu.org; Sun, 16 Nov 2014 11:00:35 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xq2FU-00066M-LG for emacs-devel@gnu.org; Sun, 16 Nov 2014 11:00:29 -0500 Original-Received: from randomsample.de ([5.45.97.173]:34850) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xq2FU-00065x-9B; Sun, 16 Nov 2014 11:00:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=randomsample.de; s=a; h=Content-Transfer-Encoding:Content-Type:MIME-Version:Message-ID:Date:References:In-Reply-To:Subject:Cc:To:From; bh=gXWvlcRY9ymg9Rb3le+8ldbDJrNKEnevS3fDoaDZsPE=; b=sMadxtBbj9AkB9CyQ4bpLVwsVH7sISQW9NdMv4vix+2bLl21433xaeBPg70Cry8LfrQNtEiZOo82Z5jqew1GN29HwcGQyTdKwxO2Of9ut07y2VgooXDE75DN/qi6B/Fk; Original-Received: from ip2504b377.dynamic.kabel-deutschland.de ([37.4.179.119] helo=spaten) by randomsample.de with esmtpsa (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1Xq2FS-000455-K6; Sun, 16 Nov 2014 17:00:22 +0100 In-Reply-To: <83egt3dv5k.fsf@gnu.org> (Eli Zaretskii's message of "Sun, 16 Nov 2014 17:25:59 +0200") User-Agent: Gnus/5.13001 (Ma Gnus v0.10) Emacs/24.3.91 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 5.45.97.173 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:177312 Archived-At: Eli Zaretskii writes: >> From: Achim Gratz >> Date: Sun, 16 Nov 2014 09:19:12 +0100 >>=20 > >> =D3scar Fuentes writes: >> > IMO we should encourage people to use fetch+rebase instead of `pull', >> > reserving merges for logically-related changes that comprise multiple >> > commits. >>=20 >> ...or configure Git to have "git pull" do exactly that, at least for the >> branches that are going upstream. > > What about "pull --rebase=3Dpreserve"? 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). -David