From: Stijn Souffriau <stijn.souffriau@essensium.com>
To: git@vger.kernel.org
Subject: rebase --merge question
Date: Sat, 09 Mar 2013 16:15:16 +0100 [thread overview]
Message-ID: <513B5204.7080000@essensium.com> (raw)
Hi all,
From help rebase:
--merge
Use merging strategies to rebase. When the recursive (default) merge
strategy is used, this allows rebase to be aware of renames on the
upstream side.
Renames of what? Files I assume. Are there any disadvantages compared to
the normal rebase? If not, why isn't --merge the default behaviour.
Thanks,
Stijn
--
Stijn Souffriau
Embedded Software Developer - Mind Embedded Software Division
ESSENSIUM nv
Mind - Embedded Software Division
Gaston Geenslaan 9 - B-3001 Leuven
email : stijn.souffriau@essensium.com
Web: www.essensium.com / www.mind.be
BE 872 984 063 RPR Leuven
reply other threads:[~2013-03-09 15:15 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=513B5204.7080000@essensium.com \
--to=stijn.souffriau@essensium.com \
--cc=git@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).