From: Junio C Hamano <gitster@pobox.com>
To: "SZEDER Gábor" <szeder.dev@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: bug: interactive rebase's 'edit' insn copies notes to newly inserted commit
Date: Fri, 23 Aug 2019 09:41:28 -0700 [thread overview]
Message-ID: <xmqqef1bn8av.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20190823133850.GK20404@szeder.dev> ("SZEDER Gábor"'s message of "Fri, 23 Aug 2019 15:38:50 +0200")
SZEDER Gábor <szeder.dev@gmail.com> writes:
> ... However, once
> rebase stops for the 'edit' instruction the user can do just about
> anything, so I'm not sure how rebase could figure out when to copy the
> note and when not.
True.
> This doesn't happen when inserting a 'break' instruction between
> picking the "second" and "third" commits, and then adding new commits.
Meaning the original note for the second one is carried to the
rewritten second, and the one for the third is carried to the
rewritten third? That would be a reasonable outcome.
> Alas, the 'break' instruction is not even a year old, and I have been
> using 'edit' for this purpose for over a decade now... so
> re-training my fingers will be hard :)
Probably a section in the tutorial and/or the example section of the
"git rebase -i" documentation should encourage use of "break" when
inserting a brand-new commit in the middle.
Thanks.
prev parent reply other threads:[~2019-08-23 16:41 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-23 13:38 bug: interactive rebase's 'edit' insn copies notes to newly inserted commit SZEDER Gábor
2019-08-23 16:41 ` Junio C Hamano [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=xmqqef1bn8av.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=szeder.dev@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).