All of lore.kernel.org
 help / color / mirror / Atom feed
From: Max Kirillov <max@max630.net>
To: Jonathon Mah <me@JonathonMah.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: RFC: Renaming "git rebase --onto"
Date: Tue, 31 Mar 2015 00:53:54 +0300	[thread overview]
Message-ID: <20150330215354.GB8771@wheezy.local> (raw)
In-Reply-To: <05D9209E-FAA2-44C8-9B98-B00997AF5779@JonathonMah.com>

On Mon, Mar 30, 2015 at 01:49:34PM -0700, Jonathon Mah wrote:
> During a few years of discussing git operations with colleagues, I’ve found the “git rebase --onto” operation particularly ambiguous. The reason is that I always describe a rebase operation as “onto” something else (because of the English phrase “A is based on B”). For example: 
> 
> $ git rebase new-base  # “Rebase HEAD onto new-base (from merge-base of HEAD and new-base)"
> $ git rebase new-base my-branch  # “Rebase my-branch onto new-base (from merge-base of my-branch and new-base)”
> 
> Personally, I understand “git-rebase --onto new-base old-base” as meaning “rebase from old-base to new-base”. Some prepositions that might make this clearer:
> 
> $ git rebase --from old-base new-base  # “Rebase HEAD onto new-base, from old-base"
> $ git rebase --after old-base new-base  # “Rebase commits on HEAD after old-base HEAD onto new-base"
> $ git rebase --excluding old-base new-base  # “Rebase HEAD onto new-base, excluding commit old-base (and its parents)"
> 
> In all cases this would change the order of the arguments compared to --onto, making it more consistent with the  no-option rebase.
> 
> What do others think? Is my view of “onto” common or unusual?

I have never liked the --onto syntax also. It's not only
ugly but still fails to cover some needs. So in my, you know,
clone of rebase I have made completely different syntax.
You can take a look at it here:
https://github.com/max630/git-rebase2/#usage

I just copy the line here, without descriptions:
git rebase2 [options] <dest> [[<source_from>]..[<through1>..<through2>]..[<source_to>]] [<target>]

-- 
Max

      parent reply	other threads:[~2015-03-30 21:53 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-30 20:49 RFC: Renaming "git rebase --onto" Jonathon Mah
2015-03-30 21:03 ` Jonathan Nieder
2015-03-30 21:12 ` Junio C Hamano
2015-04-02 16:40   ` Michael J Gruber
2015-03-30 21:53 ` Max Kirillov [this message]

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=20150330215354.GB8771@wheezy.local \
    --to=max@max630.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=me@JonathonMah.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.