From: Alexander Litvinov <litvinov2004@gmail.com>
To: git@vger.kernel.org
Subject: Rebase, please help
Date: Wed, 11 Apr 2007 08:52:00 +0700 [thread overview]
Message-ID: <200704110852.00540.litvinov2004@gmail.com> (raw)
Hello list.
I have found that rebase have (new) option : --merge
Looking at the code show me that regular rebase is a simply format-patch and
am but --merge (or -s) use some merge stratyegy to merge changes between two
commits into current head.
What is --merge for ? Will the result be the same ?
next reply other threads:[~2007-04-11 1:52 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-04-11 1:52 Alexander Litvinov [this message]
2007-04-11 7:38 ` Rebase, please help Junio C Hamano
2007-04-11 10:10 ` Andy Parkins
2007-04-12 20:37 ` Junio C Hamano
2007-04-12 21:22 ` Linus Torvalds
2007-04-11 7:48 ` Alex Riesen
2007-04-11 9:46 ` Junio C Hamano
2007-04-11 11:32 ` Alex Riesen
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=200704110852.00540.litvinov2004@gmail.com \
--to=litvinov2004@gmail.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 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.