git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Olliver Schinagl <oliver@schinagl.nl>
To: gitgitgadget@gmail.com
Cc: Johannes.Schindelin@gmx.de, git@vger.kernel.org,
	oliver@schinagl.nl, phillip.wood@dunelm.org.uk
Subject: Re: [PATCH] rebase -i: allow a comment after a "break" command
Date: Thu, 12 Jan 2023 12:26:58 +0100	[thread overview]
Message-ID: <bfa6c4d2-b18c-3484-995f-2e3809a5c7d5@schinagl.nl> (raw)
In-Reply-To: <pull.1460.git.1673519809510.gitgitgadget@gmail.com>

Hey Phillip,

Thanks for looking into this! Much appreciated!

> @@ -869,7 +869,9 @@ the files and/or the commit message, amend the 
> commit, and continue   rebasing.
>   
>   To interrupt the rebase (just like an "edit" command would do, but without
> -cherry-picking any commit first), use the "break" command. 
> +cherry-picking any commit first), use the "break" command. A "break" 
> +command may be followed by a comment beginning with `#` followed by a 
> +space.
Any technical reason for this? Traditionally, anything goes after a 
comment marker, so why be exceptional here?


Thanks,

Olliver

>   
>   If you just want to edit the commit message for a commit, replace the
>   command "pick" with the command "reword".
> diff 
> <https://lore.kernel.org/git/pull.1460.git.1673519809510.gitgitgadget@gmail.com/#iZ31sequencer.c> 
> --git a/sequencer.c b/sequencer.c index bcb662e23be..c66f382dfbc 
> 100644 --- a/sequencer.c +++ b/sequencer.c


  parent reply	other threads:[~2023-01-12 11:36 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-12 10:36 [PATCH] rebase -i: allow a comment after a "break" command Phillip Wood via GitGitGadget
2023-01-12 11:14 ` Andrei Rybak
2023-01-12 16:26   ` Phillip Wood
2023-01-12 11:26 ` Olliver Schinagl [this message]
2023-01-12 12:25 ` Ævar Arnfjörð Bjarmason
2023-01-12 12:47   ` Olliver Schinagl
2023-01-12 16:20   ` Phillip Wood
2023-01-12 16:28     ` Ævar Arnfjörð Bjarmason
2023-01-12 18:04       ` Elijah Newren
2023-01-12 17:14   ` Elijah Newren
2023-01-13 20:17     ` Junio C Hamano
2023-01-14  2:47       ` Elijah Newren
2023-01-12 15:52 ` Junio C Hamano
2023-01-12 16:29   ` Phillip Wood
2023-01-12 16:46   ` Jeff King
2023-01-13 20:22     ` Junio C Hamano
2023-01-13 20:29       ` Sergey Organov
2023-01-17 15:33       ` 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=bfa6c4d2-b18c-3484-995f-2e3809a5c7d5@schinagl.nl \
    --to=oliver@schinagl.nl \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitgitgadget@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).