From: Junio C Hamano <gitster@pobox.com>
To: Phillip Wood <phillip.wood123@gmail.com>
Cc: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>,
phillip.wood@dunelm.org.uk, git@vger.kernel.org,
Christian Couder <christian.couder@gmail.com>,
Charvi Mendiratta <charvi077@gmail.com>,
Marc Branchaud <marcnarc@xiplink.com>,
Johannes Sixt <j6t@kdbg.org>
Subject: Re: [RESEND v2] git-rebase.txt: rewrite docu for fixup/squash (again)
Date: Tue, 24 Oct 2023 10:19:19 -0700 [thread overview]
Message-ID: <xmqq34y0546g.fsf@gitster.g> (raw)
In-Reply-To: <b2b76344-11b7-4f21-8658-f18ffcca2dea@gmail.com> (Phillip Wood's message of "Tue, 24 Oct 2023 10:22:17 +0100")
Phillip Wood <phillip.wood123@gmail.com> writes:
> I agree there is an argument for improving the implementation of
> --autosquash but until we do I think it is counterproductive to change
> the documentation like this as it will cause users to wonder why
> "rebase --autosquash" generates a todo list that is incorrect
> according to the documentation.
That's a good point.
> I do think it is a good idea to document where the authorship of a
> rebased commit comes from.
Yeah, sounds like a good idea. As to the authorship information, it
might be nicer if the "rebase -i" insn language supported an option
to trigger --reset-author (or even better, --author=...) action for
a single commit, but I presume that it is rather a rare event, and
as long as people understand that they can stop the sequencing
(e.g., an "edit" of the commit would do) and run "commit --amend",
it should be OK, so it probably is OK to leave it as-is.
Thanks.
next prev parent reply other threads:[~2023-10-24 17:19 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-23 13:00 [RESEND v2] git-rebase.txt: rewrite docu for fixup/squash (again) Oswald Buddenhagen
2023-10-23 16:01 ` Phillip Wood
2023-10-23 17:52 ` Oswald Buddenhagen
2023-10-24 9:22 ` Phillip Wood
2023-10-24 17:19 ` Junio C Hamano [this message]
2023-10-23 16:59 ` Taylor Blau
2023-10-24 21:31 ` Oswald Buddenhagen
2023-10-24 14:01 ` Marc Branchaud
2023-10-24 21:19 ` Oswald Buddenhagen
2023-10-27 12:39 ` Marc Branchaud
2023-10-27 13:08 ` Oswald Buddenhagen
2023-10-25 10:29 ` [PATCH v3] " Oswald Buddenhagen
2023-10-27 13:14 ` Marc Branchaud
2023-10-27 16:12 ` Oswald Buddenhagen
2023-10-27 23:34 ` Junio C Hamano
2023-10-31 18:48 ` Marc Branchaud
2023-10-30 9:55 ` Phillip Wood
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=xmqq34y0546g.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=charvi077@gmail.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.org \
--cc=marcnarc@xiplink.com \
--cc=oswald.buddenhagen@gmx.de \
--cc=phillip.wood123@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
/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).