From: Jens Lehmann <Jens.Lehmann@web.de>
To: Mike Linck <mgl@absolute-performance.com>
Cc: Michael Witten <mfwitten@gmail.com>, git@vger.kernel.org
Subject: Re: Questions about branches in git
Date: Thu, 28 Jan 2010 22:29:32 +0100 [thread overview]
Message-ID: <4B6201BC.9030800@web.de> (raw)
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.
next prev parent reply other threads:[~2010-01-28 21:29 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-28 18:44 Questions about branches in git Mike Linck
2010-01-28 20:03 ` Michael Witten
2010-01-28 20:20 ` Michael Witten
2010-01-28 20:35 ` Michael Witten
2010-01-28 21:17 ` Mike Linck
2010-01-28 21:29 ` Jens Lehmann [this message]
2010-01-28 21:38 ` Mike Linck
2010-01-28 23:07 ` Heiko Voigt
2010-01-29 0:03 ` Nanako Shiraishi
2010-01-29 3:03 ` Junio C Hamano
2010-01-28 22:04 ` Nicolas Pitre
2010-01-28 22:13 ` Eugene Sajine
2010-01-28 22:14 ` David Aguilar
2010-01-28 22:18 ` Michael Witten
2010-01-28 22:56 ` Mike Linck
2010-01-28 23:01 ` Michael Witten
2010-01-29 10:07 ` Peter Krefting
2010-01-28 23:00 ` Martin Langhoff
2010-01-28 23:33 ` Junio C Hamano
2010-01-29 1:16 ` Mike Linck
2010-01-29 10:06 ` Peter Krefting
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=4B6201BC.9030800@web.de \
--to=jens.lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=mfwitten@gmail.com \
--cc=mgl@absolute-performance.com \
/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.
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.