Re: [PATCH] git-rebase: clean up dashed-usages in messages

2017-11-20 Thread Junio C Hamano
Kaartic Sivaraam writes: > Signed-off-by: Kaartic Sivaraam > --- Thanks. Two fewer git-foo exposed to the end user. Good ;-) > git-rebase.sh | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/git-rebase.sh

[PATCH] git-rebase: clean up dashed-usages in messages

2017-11-20 Thread Kaartic Sivaraam
Signed-off-by: Kaartic Sivaraam --- git-rebase.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git-rebase.sh b/git-rebase.sh index 6344e8d5e..2f5d138a0 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -9,7 +9,7 @@ OPTIONS_STUCKLONG=t

Re: [PATCH] git-rebase: clean up dashed-usages in messages

2017-11-19 Thread Junio C Hamano
Kaartic Sivaraam writes: > On Sunday 19 November 2017 07:42 AM, Junio C Hamano wrote: >>> test -f "$apply_dir"/applying && >>> - die "$(gettext "It looks like git-am is in progress. Cannot rebase.")" >>> + die "$(gettext "It looks like you are in the middle of

Re: [PATCH] git-rebase: clean up dashed-usages in messages

2017-11-19 Thread Kaartic Sivaraam
On Sunday 19 November 2017 07:42 AM, Junio C Hamano wrote: test -f "$apply_dir"/applying && - die "$(gettext "It looks like git-am is in progress. Cannot rebase.")" + die "$(gettext "It looks like you are in the middle of an am session. Cannot rebase.")" Probably not, as 'am'

Re: [PATCH] git-rebase: clean up dashed-usages in messages

2017-11-18 Thread Junio C Hamano
> git rebase [-i] [options] [--exec ] [--onto ] [] > [] > git rebase [-i] [options] [--exec ] [--onto ] --root [] > -git-rebase --continue | --abort | --skip | --edit-todo > +git rebase --continue | --abort | --skip | --edit-todo A good change. > test -f "$apply_dir"/applying && > - die

[PATCH] git-rebase: clean up dashed-usages in messages

2017-11-18 Thread Kaartic Sivaraam
Signed-off-by: Kaartic Sivaraam --- git-rebase.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git-rebase.sh b/git-rebase.sh index 6344e8d5e..42a485aaa 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -9,7 +9,7 @@ OPTIONS_STUCKLONG=t