git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] Prompt to continue when editing during rebase --interactive
@ 2008-02-27 12:50 Jonathan del Strother
  2008-02-27 13:22 ` Paolo Ciarrocchi
  2008-02-27 19:48 ` Junio C Hamano
  0 siblings, 2 replies; 3+ messages in thread
From: Jonathan del Strother @ 2008-02-27 12:50 UTC (permalink / raw)
  To: Git Mailing List

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(-)

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

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] Prompt to continue when editing during rebase --interactive
  2008-02-27 12:50 [PATCH] Prompt to continue when editing during rebase --interactive Jonathan del Strother
@ 2008-02-27 13:22 ` Paolo Ciarrocchi
  2008-02-27 19:48 ` Junio C Hamano
  1 sibling, 0 replies; 3+ messages in thread
From: Paolo Ciarrocchi @ 2008-02-27 13:22 UTC (permalink / raw)
  To: Jonathan del Strother; +Cc: Git Mailing List

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>

>
>   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/

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] Prompt to continue when editing during rebase --interactive
  2008-02-27 12:50 [PATCH] Prompt to continue when editing during rebase --interactive Jonathan del Strother
  2008-02-27 13:22 ` Paolo Ciarrocchi
@ 2008-02-27 19:48 ` Junio C Hamano
  1 sibling, 0 replies; 3+ messages in thread
From: Junio C Hamano @ 2008-02-27 19:48 UTC (permalink / raw)
  To: Jonathan del Strother; +Cc: Git Mailing List

"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.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2008-02-27 19:50 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-02-27 12:50 [PATCH] Prompt to continue when editing during rebase --interactive Jonathan del Strother
2008-02-27 13:22 ` Paolo Ciarrocchi
2008-02-27 19:48 ` Junio C Hamano

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).