threads / patch / 12341

patchPrompt to continue when editing during rebase --interactive

Subject: [PATCH] Prompt to continue when editing during rebase --interactive

## tl;dr

3 messages between Feb 27, 2008 and Feb 27, 2008. Diffs are folded; open one to read it.

replies: 2people: 3as markdown or json

Jonathan del Strother· Feb 27, 2008, 12:50 UTC · lore

On hitting an edit point in an interactive rebase, git should prompt the user to run "git rebase --continue"

Signed-off-by: Jonathan del Strother <jon.delStrother@bestbefore.tv>
---

 git-rebase--interactive.sh |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

Show changes to git-rebase--interactive.sh +4 −0

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index fb12b03..c2bedd6 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -268,6 +268,10 @@ do_next () {
 		warn
 		warn "	git commit --amend"
 		warn
+		warn "Once you are satisfied with your changes, run"
+		warn
+		warn "	git rebase --continue"
+		warn
 		exit 0
 		;;
 	squash|s)

-- 
1.5.4.1.97.g40aab

Paolo Ciarrocchi· Feb 27, 2008, 13:22 UTC · re: Jonathan del Strother · lore

Re: [PATCH] Prompt to continue when editing during rebase --interactive

On Wed, Feb 27, 2008 at 1:50 PM, Jonathan del Strother <maillist@steelskies.com> wrote:

> On hitting an edit point in an interactive rebase, git should prompt
>  the user to run "git rebase --continue"

Very nice, I hit the same UI defect a few days ago but I didn't have time to try to fix it.

>  Signed-off-by: Jonathan del Strother <jon.delStrother@bestbefore.tv>

FWIW,
Acked-by: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>

Show 26 quoted lines

>
>   git-rebase--interactive.sh |    4 ++++
>   1 files changed, 4 insertions(+), 0 deletions(-)
>
>  diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
>  index fb12b03..c2bedd6 100755
>  --- a/git-rebase--interactive.sh
>  +++ b/git-rebase--interactive.sh
>  @@ -268,6 +268,10 @@ do_next () {
>                 warn
>                 warn "  git commit --amend"
>                 warn
>  +               warn "Once you are satisfied with your changes, run"
>  +               warn
>  +               warn "  git rebase --continue"
>  +               warn
>                 exit 0
>                 ;;
>         squash|s)
>  --
>  1.5.4.1.97.g40aab
>  -
>  To unsubscribe from this list: send the line "unsubscribe git" in
>  the body of a message to majordomo@vger.kernel.org
>  More majordomo info at  http://vger.kernel.org/majordomo-info.html
>

-- 
Paolo
http://paolo.ciarrocchi.googlepages.com/

Junio C Hamano· Feb 27, 2008, 19:48 UTC · re: Jonathan del Strother · lore

Re: [PATCH] Prompt to continue when editing during rebase --interactive

"Jonathan del Strother" <maillist@steelskies.com> writes:

> On hitting an edit point in an interactive rebase, git should prompt
> the user to run "git rebase --continue"

Yeah, this was suggested on the list earlier, we had a couple of comments but overall I think the consensus was favorable.

Thanks.