From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Recording the date at which a change was pushed to Savannah Date: Wed, 03 Dec 2014 16:10:30 -0500 Message-ID: References: <9e4mtd1cdi.fsf@fencepost.gnu.org> <87r3whkw6w.fsf@uwakimon.sk.tsukuba.ac.jp> <87388xw2pn.fsf@fencepost.gnu.org> <83fvcw6281.fsf@gnu.org> <83bnnk5z9g.fsf@gnu.org> <83a9345vmt.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1417641090 6378 80.91.229.3 (3 Dec 2014 21:11:30 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 3 Dec 2014 21:11:30 +0000 (UTC) Cc: dak@gnu.org, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Dec 03 22:11:22 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 1XwHCj-0006pw-T9 for ged-emacs-devel@m.gmane.org; Wed, 03 Dec 2014 22:11:22 +0100 Original-Received: from localhost ([::1]:43365 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XwHCj-0003vz-Dw for ged-emacs-devel@m.gmane.org; Wed, 03 Dec 2014 16:11:21 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40854) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XwHCO-0003vt-N8 for emacs-devel@gnu.org; Wed, 03 Dec 2014 16:11:08 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XwHCH-0001aC-6o for emacs-devel@gnu.org; Wed, 03 Dec 2014 16:11:00 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:62033) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XwHC0-0001Pz-Tk; Wed, 03 Dec 2014 16:10:37 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AjsPAOwQflRMCqTq/2dsb2JhbABbgweDYIVaxR0EAgKBJBcBAQEBAQF8hAMBAQMBViMFCws0EhQYDSSISgnWWQEBAQEGAQEBAR6QbweESAWLAZIxj3OCCoF4hBkhgncBAQE X-IPAS-Result: AjsPAOwQflRMCqTq/2dsb2JhbABbgweDYIVaxR0EAgKBJBcBAQEBAQF8hAMBAQMBViMFCws0EhQYDSSISgnWWQEBAQEGAQEBAR6QbweESAWLAZIxj3OCCoF4hBkhgncBAQE X-IronPort-AV: E=Sophos;i="5.07,502,1413259200"; d="scan'208";a="99497136" Original-Received: from 76-10-164-234.dsl.teksavvy.com (HELO pastel.home) ([76.10.164.234]) by ironport2-out.teksavvy.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 03 Dec 2014 16:10:36 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id E86E888E1; Wed, 3 Dec 2014 16:10:30 -0500 (EST) In-Reply-To: <83a9345vmt.fsf@gnu.org> (Eli Zaretskii's message of "Wed, 03 Dec 2014 22:24:58 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.181 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:178775 Archived-At: >> IIRC when you do: >> >> git commit >> git pull >> >> git push >> >> The merge commit will put what was previously "the mainline" in the >> "second" position, while your "git commit" will now appear as being on >> "the mainline". > That's why we recommend "git pull --rebase" in this case (and I > actually pull.rebase = preserve in my .gitconfig). There might also be a way to ask Git to generate the "merge commit" with its two parent swapped. > But in any case, no matter how the mainline became one, it is still > _the_ mainline, right? No, in the above example, the commit that was the head of the remote branch before the "git push" (and was hence obviously on "the" mainline) is not in "the" mainline after the "git push". Stefan