all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Eli Zaretskii <eliz@gnu.org>
To: Harald Hanche-Olsen <hanche@math.ntnu.no>
Cc: bruce.connor.am@gmail.com, emacs-devel@gnu.org
Subject: Re: [Emacs-diffs] master b6610d5 2/4: emacs-lisp/package.el: Refactor	pre-execute prompt
Date: Mon, 06 Apr 2015 20:01:10 +0300	[thread overview]
Message-ID: <83h9stjind.fsf@gnu.org> (raw)
In-Reply-To: <5522BA5B.8070102@math.ntnu.no>

> Date: Mon, 06 Apr 2015 18:54:51 +0200
> From: Harald Hanche-Olsen <hanche@math.ntnu.no>
> Cc: emacs-devel <emacs-devel@gnu.org>
> 
> 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?

AFAIU, in this case bisect will blame the merge-commit, and you can
then bisect further the merged branch, by starting bisect with the
second parent of the merge.



  reply	other threads:[~2015-04-06 17:01 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20150406102057.929.89886@vcs.savannah.gnu.org>
     [not found] ` <E1Yf49K-0000G6-N0@vcs.savannah.gnu.org>
2015-04-06 10:51   ` [Emacs-diffs] master b6610d5 2/4: emacs-lisp/package.el: Refactor pre-execute prompt Dmitry Gutov
2015-04-06 11:05     ` Eli Zaretskii
2015-04-06 14:01       ` Artur Malabarba
2015-04-06 14:15         ` Eli Zaretskii
2015-04-06 15:22           ` Artur Malabarba
2015-04-06 16:01             ` Harald Hanche-Olsen
2015-04-06 16:25               ` Artur Malabarba
2015-04-06 16:54                 ` Harald Hanche-Olsen
2015-04-06 17:01                   ` Eli Zaretskii [this message]
2015-04-06 17:03                   ` Harald Hanche-Olsen
2015-04-06 17:40                   ` Artur Malabarba
2015-04-07 19:23                     ` Stephen J. Turnbull
2015-04-06 13:49     ` Artur Malabarba
2015-04-06 21:22       ` Paul Eggert
2015-04-06 23:41         ` Artur Malabarba

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=83h9stjind.fsf@gnu.org \
    --to=eliz@gnu.org \
    --cc=bruce.connor.am@gmail.com \
    --cc=emacs-devel@gnu.org \
    --cc=hanche@math.ntnu.no \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.