Normally rebase takes a segment of your command history, so _always_ has
a definite start point in the _middle_ of history because even if you
leave the parameter blank, git will use the upstream branch default. So
if you don't want to do that, but actually take _everything_ from the
root commit all the way to the tip, then you expressly have to say
"rebase, starting ate --root".
The --merge option(s) are 'fun'. I.e. too much backward compatibility
and mis-steps means you can get confused. Normally git will only take
the first parent sequence of commits for rebasing, and ignore all merges
within the sequence (because by assumption they will have been clean
merges and therefore contain nothing useful..). But if you 'agree to
differ' and those merges included then you need to ask for more. Look
at all the different options that include 'merge', and their interaction
with interactive. It does get confusing. a slow read and stackoverflow
can help....
On 06/04/2019 09:53, neverasi...@gmail.com wrote:
Hi all,
could anyone clarify the meaning and the usage of
* --root command line option,
* --merge command line option (Maybe is it anyway related to merge
option in interactive todo-file?),
possibly providing an example in principle?
The official documentation is very obscure because too synthetic ...
it could be understood just by whoever already knows GiT.
--
You received this message because you are subscribed to the Google
Groups "Git for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send
an email to git-users+unsubscr...@googlegroups.com
<mailto:git-users+unsubscr...@googlegroups.com>.
For more options, visit https://groups.google.com/d/optout.
--
You received this message because you are subscribed to the Google Groups "Git for
human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
