Why does git merge have so much trouble with Fedora package branches?

[Tom Hughes]

On 10/11/11 13:38, Simo Sorce wrote:
> On Thu, 2011-11-10 at 19:07 +0800, Mathieu Bridon wrote:
>
>> Yes, in case of such a fast-forward then rebasing gives the same result
>> as merging.
>
> No, you are dead wrong here. Merging does *join* the history of 2
> branches in git, and the top commit has multiple ancestors.

Not if it is a fast forward merge, unless you force it. Here's what the 
manual says:

  --ff, --no-ff
      Do not generate a merge commit if the merge resolved as a
      fast-forward, only update the branch pointer. This is the default
      behavior of git-merge.

      With --no-ff Generate a merge commit even if the merge resolved as
      a fast-forward.

Tom

-- 
Tom Hughes (tom at compton.nu)
http://compton.nu/