Re: Questions about branches in git

From: Nicolas Pitre <nico@fluxnic.net>
Date: Jan 28, 2010, 22:04 UTC
Message-ID: <alpine.LFD.2.00.1001281656440.1681@xanadu.home>
In-Reply-To: <69b754db1001281317o69f8c3f9y412a8524407bacbf@mail.gmail.com>

On Thu, 28 Jan 2010, Mike Linck wrote:

Show 6 quoted lines

> 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 should consider using tags in conjunction with your bugs/tickets system. The fork point for a bug fix may be tagged, as well as the last commit representing the bugfix completion (not the merge point though). This way you can always retrieve the exact set of commits forming up that bugfix, regardless if it was merged back into the main branch with a fast forward or not.

Nicolas