From: Jens Lehmann <jens.lehmann@web.de>
Date: Thu, 28 Jan 2010 21:29:32 GMT
Subject: Re: Questions about branches in git
Message-ID: <4B6201BC.9030800@web.de>
In-Reply-To: <69b754db1001281317o69f8c3f9y412a8524407bacbf@mail.gmail.com>

Am 28.01.2010 22:17, schrieb Mike Linck:
> Well, even gitk can't show me the information I'm looking for if the
> parent branch ended up fast-forwarding to include the changes made in
> the topic branch.  As far as I can tell there is *no way* to tell what
> changes were made in a particular branch after a fast-forward has
> taken place, which seems to make it hard to organize fixes for
> specific topics/bugs/tickets.

You could disable fast forward merges using the --no-ff option. Then
git will always create a merge commit even if it could have done a
fast forward. This can be enabled permanently for a branch with
'git config branch.master.mergeoptions  "--no-ff"'. We use that at my
dayjob to preserve the branches after merging.