From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-2.6 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,STOX_REPLY_TYPE, T_RP_MATCHES_RCVD shortcircuit=no autolearn=no autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 93AD11FADF for ; Thu, 18 Jan 2018 22:08:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753921AbeARWIK (ORCPT ); Thu, 18 Jan 2018 17:08:10 -0500 Received: from smtp-out-4.talktalk.net ([62.24.135.68]:54286 "EHLO smtp-out-4.talktalk.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750718AbeARWIJ (ORCPT ); Thu, 18 Jan 2018 17:08:09 -0500 Received: from PhilipOakley ([92.29.14.162]) by smtp.talktalk.net with SMTP id cILveThMcAp17cILveDYP0; Thu, 18 Jan 2018 22:08:08 +0000 X-Originating-IP: [92.29.14.162] X-Spam: 0 X-OAuthority: v=2.2 cv=EsGilWUA c=1 sm=1 tr=0 a=NXc+vVEgz70gitWznrz3ig==:117 a=NXc+vVEgz70gitWznrz3ig==:17 a=IkcTkHD0fZMA:10 a=pGLkceISAAAA:8 a=1XWaLZrsAAAA:8 a=XcpDTPfKAAAA:8 a=w4rfsmNkK4XTtirAVdYA:9 a=QEXdDO2ut3YA:10 Message-ID: <32EA49C74ECD470F8EE898D965833E02@PhilipOakley> Reply-To: "Philip Oakley" From: "Philip Oakley" To: "Jacob Keller" , "Stefan Beller" Cc: "Johannes Schindelin" , "Git mailing list" , "Junio C Hamano" References: <20180118183618.39853-1-sbeller@google.com> <20180118183618.39853-3-sbeller@google.com> Subject: Re: [PATCH 10/8] [DO NOT APPLY, but improve?] rebase--interactive: introduce "stop" command Date: Thu, 18 Jan 2018 22:08:09 -0000 Organization: OPDS MIME-Version: 1.0 Content-Type: text/plain; format=flowed; charset="UTF-8"; reply-type=original Content-Transfer-Encoding: 7bit X-Priority: 3 X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook Express 6.00.2900.5931 X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.6157 X-Antivirus: AVG (VPS 180118-34, 18/01/2018), Outbound message X-Antivirus-Status: Clean X-CMAE-Envelope: MS4wfE9YqqbR2Mk97y4vAksUsK55GG/q60yZcsFKUwpYogEA6zDmEFqDlUOPSldqMPH2dyGcih+TRB9DmTM/RAWHOAI/mbEjEvb9IBqLtMkkwEIZFeqkK+x8 bmE9Dod+XiDXRQB9k7FuTSruYOC+qdb6s0k0BGh94MHqzF0F/y2pl6+gtpxAuqSkipIyCM26w6G7ed1Ymsk3ochT4Zm2nHQXrIBmGrhU+cfPPZvgaTz5CJkN wv8ja6lzCMfpRJ9SS/+h7WPEs2rE7PHlUB2QgsqXFF0wa+q10AlxTVwwi/OhjgVU Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: "Jacob Keller" > On Thu, Jan 18, 2018 at 10:36 AM, Stefan Beller > wrote: >> Jake suggested using "x false" instead of "edit" for some corner cases. >> >> I do prefer using "x false" for all kinds of things such as stopping >> before a commit (edit only let's you stop after a commit), and the >> knowledge that "x false" does the least amount of actions behind my back. >> >> We should have that command as well, maybe? >> > > > I agree. I use "x false" very often, and I think stop is probably a > better solution since it avoids spawning an extra shell that will just > fail. Not sure if stop implies too much about "stop the whole thing" > as opposed to "stop here and let me do something manual", but I think > it's clear enough. > 'hold' or 'pause' maybe options (leads to http://www.thesaurus.com/browse/put+on+hold offering procastinate etc.) 'adjourn'. > >> Signed-off-by: Stefan Beller >> --- >> git-rebase--interactive.sh | 1 + >> sequencer.c | 10 ++++++++++ >> 2 files changed, 11 insertions(+) >> >> diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh >> index 3cd7446d0b..9eac53f0c5 100644 >> --- a/git-rebase--interactive.sh >> +++ b/git-rebase--interactive.sh >> @@ -166,6 +166,7 @@ l, label