From: Junio C Hamano <gitster@pobox.com>
To: Edmundo Carmona Antoranz <eantoranz@gmail.com>
Cc: Jeff King <peff@peff.net>, Git List <git@vger.kernel.org>
Subject: Re: [RFC/PATCH 1/2] rebuash - squash/rebase in a single step
Date: Mon, 01 Jul 2019 11:50:55 -0700 [thread overview]
Message-ID: <xmqqy31h612o.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <CAOc6etZxHWQ24TNsYDf74zgn-VJzbwDsxWxO4-tMkvv92KRKkw@mail.gmail.com> (Edmundo Carmona Antoranz's message of "Sun, 30 Jun 2019 19:37:07 -0600")
Edmundo Carmona Antoranz <eantoranz@gmail.com> writes:
> Hmm... I as a gatekeeper would rather get either a straight line of
> revisions for a feature with no merges (even if a final merge takes
> care of solving conflicts with the upstream branch) or a single
> revision (if I thought that the change is not worth having more than a
> single revision). I'd ask the developer to rebase the whole thing and
> give a straight line (with rebase -i or cherry-picks) or to give me a
> single revision (where rebuash would come into the picture).
That part is understandable, but is "rebase-and-squash" a tool
intended to be used by the contributor to respond to that request?
Wouldn't the developer just do
git checkout topic
git fetch
git rebase [-i] [@{upstream}]
git push [publish +topic]
to update the topic and ask to be pulled again? The two steps in
the middle may be "pull --rebase", but my point is I do not quite
see where the new squash/rebase-in-a-single-step thing comes into
this picture. There may be a different picture that it fits, but
I do not think it is this one.
next prev parent reply other threads:[~2019-07-01 18:51 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-30 5:18 [RFC/PATCH 1/2] rebuash - squash/rebase in a single step Edmundo Carmona Antoranz
2019-06-30 5:18 ` [RFC/PATCH 2/2] rebuash - support for status Edmundo Carmona Antoranz
2019-06-30 5:28 ` Edmundo Carmona Antoranz
2019-06-30 6:53 ` [RFC/PATCH 1/2] rebuash - squash/rebase in a single step Jeff King
2019-06-30 15:09 ` Edmundo Carmona Antoranz
2019-06-30 22:39 ` Jeff King
2019-07-01 1:37 ` Edmundo Carmona Antoranz
2019-07-01 18:50 ` Junio C Hamano [this message]
2019-07-01 20:48 ` Edmundo Carmona Antoranz
2019-07-01 18:35 ` Junio C Hamano
2019-07-02 11:37 ` Derrick Stolee
2019-07-02 17:20 ` Junio C Hamano
2019-07-02 19:30 ` Johannes Sixt
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqy31h612o.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=eantoranz@gmail.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).