From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-4.0 required=3.0 tests=AWL,BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI shortcircuit=no autolearn=ham autolearn_force=no version=3.4.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 15B691F97E for ; Thu, 11 Oct 2018 09:08:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728049AbeJKQem (ORCPT ); Thu, 11 Oct 2018 12:34:42 -0400 Received: from smtp-out-2.talktalk.net ([62.24.135.66]:58155 "EHLO smtp-out-2.talktalk.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727969AbeJKQem (ORCPT ); Thu, 11 Oct 2018 12:34:42 -0400 Received: from [192.168.2.201] ([92.28.142.68]) by smtp.talktalk.net with SMTP id AWx6gyUt1VlGZAWx6gSUIR; Thu, 11 Oct 2018 10:08:17 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=talktalk.net; s=cmr1711; t=1539248897; bh=LIB4X6nipXxqEevHjQMU/2yH+gFsJQA0AyqogWRKINk=; h=Reply-To:Subject:To:Cc:References:From:Date:In-Reply-To; b=Ga8uoNqksd7ibDIKjouxHOo8acB9K2Y5g0nxdZN1Qlqm0m3FhwONO/U3WzMWJTXsF Sinb+BhcKFzHDEX6anNDNq/BNyGWEb9xEsVYD9WTEo4AGQLF2PJp0chilqUv1GkZW7 fUH4iN8lZzwt3a4CXgi2jsMbr7dr4Z/Z5ccx/NoU= X-Originating-IP: [92.28.142.68] X-Spam: 0 X-OAuthority: v=2.3 cv=JcuSU3CV c=1 sm=1 tr=0 a=UGDAwvN9cmeZh0o4udnnNw==:117 a=UGDAwvN9cmeZh0o4udnnNw==:17 a=IkcTkHD0fZMA:10 a=1XWaLZrsAAAA:8 a=96hrjbTRVr5MxXcxFoAA:9 a=QEXdDO2ut3YA:10 Reply-To: phillip.wood@dunelm.org.uk Subject: Re: [PATCH v2 2/2] rebase -i: introduce the 'break' command To: Johannes Schindelin via GitGitGadget , git@vger.kernel.org Cc: Stefan Beller , Junio C Hamano , Johannes Schindelin References: From: Phillip Wood Message-ID: Date: Thu, 11 Oct 2018 10:08:16 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-CMAE-Envelope: MS4wfJAdhJ/5U7ahcK2MNfC88Glo05FTz+ey6XaeVbuhmG9qLxYhCpE/RdRFVh+HtMuRFoskZmTcA6qOX7Fvr4lTpjT94aCC4oPzbRKv38c9D+t8+3rlR5Xr zGaKuZmy9gByUYqALWYwv3bhPbcFnjiJvqUEPRVNC/4Q4+Lk+uZt1wh80MZQBoHAdZ00A/cbymq/G6JRORLGUWkY2j10ZLOS9OUxSKC6zdD281IR15eYxkRf jgvdp/oQHgz7ahRpoKuke+2ZvLJJSo/if3EXshOXtAcs93XJWsDpReDdzdOXjCriAjNm+FS/Y1IgkjBQMp3Z1Q== Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Hi Johannes I think this would be a useful addition to rebase, there's one small comment below. On 10/10/2018 09:53, Johannes Schindelin via GitGitGadget wrote: > From: Johannes Schindelin > > The 'edit' command can be used to cherry-pick a commit and then > immediately drop out of the interactive rebase, with exit code 0, to let > the user amend the commit, or test it, or look around. > > Sometimes this functionality would come in handy *without* > cherry-picking a commit, e.g. to interrupt the interactive rebase even > before cherry-picking a commit, or immediately after an 'exec' or a > 'merge'. > > This commit introduces that functionality, as the spanking new 'break' > command. > > Suggested-by: Stefan Beller > Signed-off-by: Johannes Schindelin > --- > Documentation/git-rebase.txt | 3 +++ > rebase-interactive.c | 1 + > sequencer.c | 7 ++++++- > t/lib-rebase.sh | 2 +- > t/t3418-rebase-continue.sh | 9 +++++++++ > 5 files changed, 20 insertions(+), 2 deletions(-) > > diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt > index db2faca73c..5bed1da36b 100644 > --- a/Documentation/git-rebase.txt > +++ b/Documentation/git-rebase.txt > @@ -561,6 +561,9 @@ By replacing the command "pick" with the command "edit", you can tell > 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 > index 0f4119cbae..78f3263fc1 100644 > --- a/rebase-interactive.c > +++ b/rebase-interactive.c > @@ -14,6 +14,7 @@ void append_todo_help(unsigned edit_todo, unsigned keep_empty, > "s, squash = use commit, but meld into previous commit\n" > "f, fixup = like \"squash\", but discard this commit's log message\n" > "x, exec = run command (the rest of the line) using shell\n" > +"b, break = stop here (continue rebase later with 'git rebase --continue')\n" > "d, drop = remove commit\n" > "l, label