From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Rob Browning Newsgroups: gmane.emacs.devel Subject: Re: Obscure error/warning/information message from git pull Date: Wed, 19 Nov 2014 20:56:35 -0600 Message-ID: <87sihezijg.fsf@trouble.defaultvalue.org> References: <20141114120604.GA3859@acm.acm> <87389mkjwo.fsf@thinkpad-t440p.tsdh.org> <20141114141434.GM3565@embecosm.com> <20141114180521.GA3168@acm.acm> <87h9y1mwxl.fsf@igel.home> <20141114200957.GC3168@acm.acm> <87y4rc5k2u.fsf@mid.deneb.enyo.de> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416452228 28993 80.91.229.3 (20 Nov 2014 02:57:08 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 20 Nov 2014 02:57:08 +0000 (UTC) Cc: Andreas Schwab , Andrew Burgess , emacs-devel@gnu.org To: Florian Weimer , Alan Mackenzie Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 20 03:57:01 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 1XrHvY-0003Go-O7 for ged-emacs-devel@m.gmane.org; Thu, 20 Nov 2014 03:57:00 +0100 Original-Received: from localhost ([::1]:33291 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XrHvY-0003cc-DJ for ged-emacs-devel@m.gmane.org; Wed, 19 Nov 2014 21:57:00 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57256) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XrHvG-0003cM-Jf for emacs-devel@gnu.org; Wed, 19 Nov 2014 21:56:47 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XrHvC-0003xI-5k for emacs-devel@gnu.org; Wed, 19 Nov 2014 21:56:42 -0500 Original-Received: from defaultvalue.org ([70.85.129.156]:56012) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XrHvC-0003xC-0l for emacs-devel@gnu.org; Wed, 19 Nov 2014 21:56:38 -0500 Original-Received: from trouble.defaultvalue.org (localhost [127.0.0.1]) (Authenticated sender: rlb@defaultvalue.org) by defaultvalue.org (Postfix) with ESMTPSA id D0CB320019; Wed, 19 Nov 2014 20:56:36 -0600 (CST) Original-Received: by trouble.defaultvalue.org (Postfix, from userid 1000) id 6E58F14E18D; Wed, 19 Nov 2014 20:56:35 -0600 (CST) In-Reply-To: <87y4rc5k2u.fsf@mid.deneb.enyo.de> User-Agent: Notmuch/0.18.2 (http://notmuchmail.org) Emacs/24.4.1 (x86_64-pc-linux-gnu) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 70.85.129.156 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:177842 Archived-At: Florian Weimer writes: > Git does not record the branch on which a commit was made. It's > sometimes recorded in merges, but only in the free-text commit > message. For fast-forward merges (without a separate merge commit), > there is no trace that development of certain commits happened on a > separate branch. And as an aside, it can sometimes be useful to preserve the information that "these commits go together", even when git could just tack the commits on to the end of the branch (which it will, when possible, by default, i.e. a fast-forward merge). To prevent that you can specify "merge --no-ff", which will force git to create a merge commit. So you'd end up with something like this (on, say master): * merge commit to add new thing (master) |\ | * third bit of thing | | | * second bit of thing | | | * first bit of thing |/ * last commit on master before merging new thing with --no-ff | instead of this (without --no-ff): * third bit of thing (master) | * second bit of thing | * first bit of thing | * last commit on master before merging new thing with --no-ff | -- Rob Browning rlb @defaultvalue.org and @debian.org GPG as of 2011-07-10 E6A9 DA3C C9FD 1FF8 C676 D2C4 C0F0 39E9 ED1B 597A GPG as of 2002-11-03 14DD 432F AE39 534D B592 F9A0 25C8 D377 8C7E 73A4