[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Emacs-diffs] master b6610d5 2/4: emacs-lisp/package.el: Refactor pr

From: Artur Malabarba
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

>> 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).

reply via email to

[Prev in Thread] Current Thread [Next in Thread]