From: Junio C Hamano <gitster@pobox.com>
To: Marc Branchaud <marcnarc@xiplink.com>
Cc: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>,
git@vger.kernel.org, Phillip Wood <phillip.wood123@gmail.com>,
Christian Couder <christian.couder@gmail.com>,
Charvi Mendiratta <charvi077@gmail.com>
Subject: Re: [RESEND] git-rebase.txt: rewrite docu for fixup/squash (again)
Date: Fri, 20 Oct 2023 16:19:58 -0700 [thread overview]
Message-ID: <xmqq1qdoq3tt.fsf@gitster.g> (raw)
In-Reply-To: <841c3b59-9e7c-4492-9d66-8af42c3222ea@xiplink.com> (Marc Branchaud's message of "Fri, 20 Oct 2023 17:40:01 -0400")
Marc Branchaud <marcnarc@xiplink.com> writes:
> [1] Makes me wonder if rebase should also support "squash -c"...
How would it be different from "fixup -c", though?
A "pick" followed by either "fixup -c" or "squash -c" will have the
same effect on the contents (i.e., apply the changes both commits
want to make to their respective parents) and present the end user
an editor buffer filled with the commit specified by the "-c"
option, right?
Or am I missing something?
next prev parent reply other threads:[~2023-10-20 23:20 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-20 9:27 [RESEND] git-rebase.txt: rewrite docu for fixup/squash (again) Oswald Buddenhagen
2023-10-20 21:40 ` Marc Branchaud
2023-10-20 23:19 ` Junio C Hamano [this message]
2023-10-20 23:56 ` Marc Branchaud
2023-10-21 0:22 ` Junio C Hamano
2023-10-21 7:26 ` Oswald Buddenhagen
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=xmqq1qdoq3tt.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=charvi077@gmail.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=marcnarc@xiplink.com \
--cc=oswald.buddenhagen@gmx.de \
--cc=phillip.wood123@gmail.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 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).