From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Artur Malabarba Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] master b6610d5 2/4: emacs-lisp/package.el: Refactor pre-execute prompt Date: Mon, 6 Apr 2015 18:40:41 +0100 Message-ID: References: <20150406102057.929.89886@vcs.savannah.gnu.org> <5522653C.5010608@yandex.ru> <837ftpldok.fsf@gnu.org> <83r3rxjqbx.fsf@gnu.org> <5522ADDD.7010303@math.ntnu.no> <5522BA5B.8070102@math.ntnu.no> Reply-To: bruce.connor.am@gmail.com NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Trace: ger.gmane.org 1428342067 3260 80.91.229.3 (6 Apr 2015 17:41:07 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 6 Apr 2015 17:41:07 +0000 (UTC) Cc: emacs-devel To: Harald Hanche-Olsen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Apr 06 19:41:07 2015 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 1YfB1E-0004Gy-T9 for ged-emacs-devel@m.gmane.org; Mon, 06 Apr 2015 19:41:05 +0200 Original-Received: from localhost ([::1]:41001 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YfB1D-0000Tg-RU for ged-emacs-devel@m.gmane.org; Mon, 06 Apr 2015 13:41:03 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57470) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YfB0u-0000TY-3p for emacs-devel@gnu.org; Mon, 06 Apr 2015 13:40:44 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YfB0s-00055j-JA for emacs-devel@gnu.org; Mon, 06 Apr 2015 13:40:43 -0400 Original-Received: from mail-lb0-x229.google.com ([2a00:1450:4010:c04::229]:35276) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YfB0s-00055W-8r for emacs-devel@gnu.org; Mon, 06 Apr 2015 13:40:42 -0400 Original-Received: by lbbuc2 with SMTP id uc2so21290544lbb.2 for ; Mon, 06 Apr 2015 10:40:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:reply-to:sender:in-reply-to:references:date:message-id :subject:from:to:cc:content-type; bh=ugFAoq+zFSavmLlnqtk3urdqozlhsmxEf1DD2NnWCnA=; b=rLjI95tce3EVpvAIdRxRAeZIglls7+L42CmBn+ZhMgXs1Ufk6ZYMas0hrRqe27RuMt mKQdV6BPImajP6lEO6Cc0hfOONW4tAmPcrLuHNGsJs8rGJ+xLRFIRtmqQALgtKhDHaZt dvfEcC+Qt8YkV1U1LGOuytWhCeIFeSn8r/HhrqRmgumB+NtT5oTrHmfO8HdDobxLZktX /8icBVkP9MnGFhGapIyQtDdydKygYJ+fSW5tkJ038Gxeqqgczlds4LdAhrPR5MeIqpDR UKsyFQ6upjqA/BdLVmxE1Zje5AS5XzEj7CCvcrCUOK3q/Z66R22OgyYVXDY/tTPKkIWT cVwQ== X-Received: by 10.112.204.6 with SMTP id ku6mr337949lbc.73.1428342041234; Mon, 06 Apr 2015 10:40:41 -0700 (PDT) Original-Received: by 10.25.150.131 with HTTP; Mon, 6 Apr 2015 10:40:41 -0700 (PDT) In-Reply-To: <5522BA5B.8070102@math.ntnu.no> X-Google-Sender-Auth: EdZ64hcAf_H04Y5ca0KSYVGdCG4 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c04::229 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:185050 Archived-At: >> git bisect searches the history of a single branch, and the history of >> each branch is linear. >> >> When you create other branches that doesn't affect the history of the >> parent branch. And when you merge another branch onto the current one, >> all it does is add a bunch of commits to it (which is linear). > > > I don't understand. Say someone creates a branch foo from master. Then each > branch has several commits, and foo is merged into master. How do you > linearly order the commits that happened on the separate branches? Once foo is merged into master, all the commits made in foo are added to master, and an additional merge commit is created. As Eli mentioned, git bisect may point you to the merge commit, but it depends on how nasty the merge was. It may also point you to one of foo's commits (because they are now on master as well).