From: Eugene Sajine <euguess@gmail.com>
To: git@vger.kernel.org
Cc: Eugene Sajine <euguess@gmail.com>
Subject: git rebase command and docs questions
Date: Fri, 9 Apr 2010 14:49:52 -0400 [thread overview]
Message-ID: <h2j76c5b8581004091149y9f5f93a8o5f11b3ffc657623@mail.gmail.com> (raw)
Hi,
I have few questions about rebase and its help content:
1. In case of this situation
o---o---o---o---o master
\
o---o---o---o---o next
\
o---o---o topic
“git rebase master topic” says:
The current branch topic is up-to-date.
This message seems to be confusing and even incorrect.
The actual problem, as I understand, is that topic branch is not a
direct descendant of the master branch, therefore
“git rebase –onto master next topic” should be used instead.
Is there a way for git to identify this problem more correctly and
print more helpful error message?
2. The rebase help is a bit confusing in its “–onto” option part.
Initially help says that the form:
git rebase master topic
is a shorthand for git checkout topic, git rebase master
But, in “git rebase –onto master next topic” the meaning of the “next
topic” parameters is different: as I understand, it actually specifies
a range of commits from next to topic, because –onto changes the way
the whole command is working, but it is not clarified in help. Is that
correct understanding?
3. The part of help from “Another example of --onto option is to
rebase part of a branch.” Is actually demonstrating absolutely the
same thing as the one before with the only difference that in the
second example the master has not advanced. There was probably some
different intention, but currently it looks like confusing
duplication.
Thanks,
Eugene
next reply other threads:[~2010-04-09 18:50 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-09 18:49 Eugene Sajine [this message]
2010-04-09 20:37 ` git rebase command and docs questions Sverre Rabbelier
2010-04-09 20:51 ` Eugene Sajine
2010-04-09 21:11 ` Junio C Hamano
2010-04-09 21:23 ` Sverre Rabbelier
2010-04-10 22:30 ` Eugene Sajine
2010-04-10 22:32 ` Sverre Rabbelier
2010-04-10 22:40 ` Eugene Sajine
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=h2j76c5b8581004091149y9f5f93a8o5f11b3ffc657623@mail.gmail.com \
--to=euguess@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 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).