git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Stefan Beller <sbeller@google.com>, Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v2 0/2] rebase -i: introduce the 'break' command
Date: Wed, 10 Oct 2018 01:53:54 -0700 (PDT)	[thread overview]
Message-ID: <pull.43.v2.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.43.git.gitgitgadget@gmail.com>

Stefan asked a while back
[https://public-inbox.org/git/20180118183618.39853-3-sbeller@google.com/] 
for a todo command in interactive rebases that would essentially perform the
"stop" part of the edit command, but without the "pick" part: interrupt the
interactive rebase, with exit code 0, letting the user do things and stuff
and look around, with the idea of continuing the rebase later (using git
rebase --continue).

This patch introduces that, based on ag/rebase-i-in-c.

Changes since v1:

 * Wrapped the commit message correctly.
 * Added a preparatory patch to mention what happens in case an exec fails.
 * Mentioned the break command in the git-rebase(1) documentation.

Johannes Schindelin (2):
  rebase -i: clarify what happens on a failed `exec`
  rebase -i: introduce the 'break' command

 Documentation/git-rebase.txt | 6 +++++-
 rebase-interactive.c         | 1 +
 sequencer.c                  | 7 ++++++-
 t/lib-rebase.sh              | 2 +-
 t/t3418-rebase-continue.sh   | 9 +++++++++
 5 files changed, 22 insertions(+), 3 deletions(-)


base-commit: 34b47315d9721a576b9536492cca0c11588113a2
Published-As: https://github.com/gitgitgadget/git/releases/tags/pr-43%2Fdscho%2Frebase-i-break-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-43/dscho/rebase-i-break-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/43

Range-diff vs v1:

 -:  ---------- > 1:  2eefdb4874 rebase -i: clarify what happens on a failed `exec`
 1:  b358178548 ! 2:  c74e02c4b6 rebase -i: introduce the 'break' command
     @@ -11,11 +11,26 @@
          before cherry-picking a commit, or immediately after an 'exec' or a
          'merge'.
      
     -    This commit introduces that functionality, as the spanking new 'break' command.
     +    This commit introduces that functionality, as the spanking new 'break'
     +    command.
      
          Suggested-by: Stefan Beller <sbeller@google.com>
          Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
      
     +diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
     +--- a/Documentation/git-rebase.txt
     ++++ b/Documentation/git-rebase.txt
     +@@
     + 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.
     ++
     + If you just want to edit the commit message for a commit, replace the
     + command "pick" with the command "reword".
     + 
     +
      diff --git a/rebase-interactive.c b/rebase-interactive.c
      --- a/rebase-interactive.c
      +++ b/rebase-interactive.c

-- 
gitgitgadget

  parent reply	other threads:[~2018-10-10  8:53 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-03 15:00 [PATCH 0/1] rebase -i: introduce the 'break' command Johannes Schindelin via GitGitGadget
2018-10-03 15:00 ` [PATCH 1/1] " Johannes Schindelin via GitGitGadget
2018-10-05  8:15   ` Junio C Hamano
2018-10-05  8:36     ` Jacob Keller
2018-10-05 15:36     ` Johannes Schindelin
2018-10-09  3:59       ` Junio C Hamano
2018-10-09  5:27         ` Junio C Hamano
2018-10-10  8:53 ` Johannes Schindelin via GitGitGadget [this message]
2018-10-10  8:53   ` [PATCH v2 1/2] rebase -i: clarify what happens on a failed `exec` Johannes Schindelin via GitGitGadget
2018-10-10  9:46     ` Eric Sunshine
2018-10-11  8:15       ` Junio C Hamano
2018-10-12  8:36         ` Johannes Schindelin
2018-10-10  8:53   ` [PATCH v2 2/2] rebase -i: introduce the 'break' command Johannes Schindelin via GitGitGadget
2018-10-11  9:08     ` Phillip Wood
2018-10-12  8:35       ` Johannes Schindelin
2018-10-12 11:09         ` Phillip Wood
2018-10-12 11:24           ` Johannes Schindelin
2018-10-12 13:14   ` [PATCH v3 0/2] " Johannes Schindelin via GitGitGadget
2018-10-12 13:14     ` [PATCH v3 1/2] rebase -i: clarify what happens on a failed `exec` Johannes Schindelin via GitGitGadget
2018-10-12 13:14     ` [PATCH v3 2/2] rebase -i: introduce the 'break' command Johannes Schindelin via GitGitGadget
2018-10-12 14:09       ` Junio C Hamano
2018-10-12 15:31         ` Johannes Schindelin
2018-10-12 14:01     ` [PATCH v3 0/2] " Junio C Hamano
2018-10-12 15:32       ` Johannes Schindelin
2018-10-25 20:47     ` [PATCH 3/2] rebase -i: recognize short commands without arguments Johannes Sixt
2018-10-26  1:26       ` Junio C Hamano
2018-10-26  8:04       ` Johannes Schindelin

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=pull.43.v2.git.gitgitgadget@gmail.com \
    --to=gitgitgadget@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=sbeller@google.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.
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).