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: Recording the date at which a change was pushed to Savannah Date: Wed, 03 Dec 2014 22:24:58 +0200 Message-ID: <83a9345vmt.fsf@gnu.org> 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> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1417638326 25741 80.91.229.3 (3 Dec 2014 20:25:26 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 3 Dec 2014 20:25:26 +0000 (UTC) Cc: dak@gnu.org, emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Dec 03 21:25:19 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 1XwGU9-00060N-S4 for ged-emacs-devel@m.gmane.org; Wed, 03 Dec 2014 21:25:18 +0100 Original-Received: from localhost ([::1]:43262 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XwGU7-0006ZR-5g for ged-emacs-devel@m.gmane.org; Wed, 03 Dec 2014 15:25:15 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58727) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XwGTq-0006YH-LX for emacs-devel@gnu.org; Wed, 03 Dec 2014 15:25:03 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XwGTl-0003lS-GH for emacs-devel@gnu.org; Wed, 03 Dec 2014 15:24:58 -0500 Original-Received: from mtaout25.012.net.il ([80.179.55.181]:59613) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XwGTf-0003kJ-L6; Wed, 03 Dec 2014 15:24:47 -0500 Original-Received: from conversion-daemon.mtaout25.012.net.il by mtaout25.012.net.il (HyperSendmail v2007.08) id <0NG000E00W7TC100@mtaout25.012.net.il>; Wed, 03 Dec 2014 22:20:28 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout25.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NG000720WI46R80@mtaout25.012.net.il>; Wed, 03 Dec 2014 22:20:28 +0200 (IST) In-reply-to: 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.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:178768 Archived-At: > From: Stefan Monnier > Cc: dak@gnu.org, emacs-devel@gnu.org > Date: Wed, 03 Dec 2014 14:34:13 -0500 > > >> > You can see the "mainline" in Git with "log --graph" or in Emacs with > >> > "C-x v L". > >> No, that's *a* mainline. It won't always agree with your idea of what > >> is *the* mainline. > > In what way and under which circumstances might that happen? > > 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). But in any case, no matter how the mainline became one, it is still _the_ mainline, right?