From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: master has switched from Automake to GNU Make Date: Sat, 25 Mar 2017 13:36:22 -0400 Message-ID: References: <58CB9F6B.5080806@gmx.at> <83h92sz2j9.fsf@gnu.org> <58CBAEB7.5030601@gmx.at> <58CBBC6C.8000104@gmx.at> <58D380FF.1070103@gmx.at> <58D3C84E.5080808@gmx.at> <58D4E0D6.2070101@gmx.at> <86mvcap85t.fsf@stephe-leake.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1490463441 6788 195.159.176.226 (25 Mar 2017 17:37:21 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sat, 25 Mar 2017 17:37:21 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.0.50 (gnu/linux) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Mar 25 18:37:17 2017 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1crpcr-0001Kf-82 for ged-emacs-devel@m.gmane.org; Sat, 25 Mar 2017 18:37:17 +0100 Original-Received: from localhost ([::1]:38112 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1crpcw-0005XV-VE for ged-emacs-devel@m.gmane.org; Sat, 25 Mar 2017 13:37:22 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33172) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1crpcK-0005XD-KV for emacs-devel@gnu.org; Sat, 25 Mar 2017 13:36:45 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1crpcF-0000Wt-PH for emacs-devel@gnu.org; Sat, 25 Mar 2017 13:36:44 -0400 Original-Received: from [195.159.176.226] (port=39068 helo=blaine.gmane.org) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1crpcF-0000We-IV for emacs-devel@gnu.org; Sat, 25 Mar 2017 13:36:39 -0400 Original-Received: from list by blaine.gmane.org with local (Exim 4.84_2) (envelope-from ) id 1crpc1-0004mj-TM for emacs-devel@gnu.org; Sat, 25 Mar 2017 18:36:25 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 14 Original-X-Complaints-To: usenet@blaine.gmane.org Cancel-Lock: sha1:L0kuJhUUyyYpFn/IdORkdnHfmfU= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 195.159.176.226 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 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" Xref: news.gmane.org gmane.emacs.devel:213347 Archived-At: >> IMO, when we do a "rebase", Git should also keep the previous history, tho >> only as a kind of "weak reference", > That kind of weak reference is the reflog. No, reflog doesn't keep parent-info about relationship between commits, so it's a completely different beast. The kind of ref I'm thinking of would be more like a commit-id embedded in the commit message of every commit created by a rebase, together with a tweak to "git merge" so that it uses those commit ids as additional parents when looking for a common ancestor. Stefan