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

6 messages from 2017-11-18 to 2017-11-21. Participants: Kaartic Sivaraam, Junio C Hamano.
Thread: https://gitlist.dev/t/47233

## Kaartic Sivaraam, 2017-11-18 16:18

Subject: [PATCH] git-rebase: clean up dashed-usages in messages
Message-ID: <20171118161810.16494-1-kaartic.sivaraam@gmail.com>
URL: https://gitlist.dev/e/20171118161810.16494-1-kaartic.sivaraam%40gmail.com

```
Signed-off-by: Kaartic Sivaraam <kaartic.sivaraam@gmail.com>
---
 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
 OPTIONS_SPEC="\
 git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] [<branch>]
 git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
-git-rebase --continue | --abort | --skip | --edit-todo
+git rebase --continue | --abort | --skip | --edit-todo
 --
  Available options are
 v,verbose!         display a diffstat of what changed upstream
@@ -216,7 +216,7 @@ run_pre_rebase_hook () {
 }
 
 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.")"
 
 if test -d "$apply_dir"
 then
-- 
2.15.0.291.g0d8980c5d


```

## Junio C Hamano, 2017-11-19 02:12

Subject: Re: [PATCH] git-rebase: clean up dashed-usages in messages
Message-ID: <xmqq4lprow2i.fsf@gitster.mtv.corp.google.com>
URL: https://gitlist.dev/e/xmqq4lprow2i.fsf%40gitster.mtv.corp.google.com
In-Reply-To: <20171118161810.16494-1-kaartic.sivaraam@gmail.com>

```
>  git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] [<branch>]
>  git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
> -git-rebase --continue | --abort | --skip | --edit-todo
> +git rebase --continue | --abort | --skip | --edit-todo

A good change.

>  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' alone would be confusing.

    "It looks like 'git am' is in progress. Cannot rebase."

may be a more sensible improvement.


```

## Kaartic Sivaraam, 2017-11-19 17:28

Subject: Re: [PATCH] git-rebase: clean up dashed-usages in messages
Message-ID: <459f9455-5edb-39a2-1511-1590e50d4545@gmail.com>
URL: https://gitlist.dev/e/459f9455-5edb-39a2-1511-1590e50d4545%40gmail.com
In-Reply-To: <xmqq4lprow2i.fsf@gitster.mtv.corp.google.com>

```
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' alone would be confusing.
> 
>      "It looks like 'git am' is in progress. Cannot rebase."
> 
> may be a more sensible improvement.
> 

Let me guess, 'am' alone would be confusing because it follows 'an' in 
the error message. So, the user might mistake it to be some kind of typo 
in the error message. Is that close to why 'am' alone would be confusing?

Anyways, I stole that from a message shown by 'git status',

     "You are in the middle of an am session."

So, does that require a change too?


---
Kaartic


```

## Junio C Hamano, 2017-11-20 00:26

Subject: Re: [PATCH] git-rebase: clean up dashed-usages in messages
Message-ID: <xmqqmv3hokvx.fsf@gitster.mtv.corp.google.com>
URL: https://gitlist.dev/e/xmqqmv3hokvx.fsf%40gitster.mtv.corp.google.com
In-Reply-To: <459f9455-5edb-39a2-1511-1590e50d4545@gmail.com>

```
Kaartic Sivaraam <kaartic.sivaraam@gmail.com> 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 an am session. Cannot rebase.")"
>>
>> Probably not, as 'am' alone would be confusing.
>>
>>      "It looks like 'git am' is in progress. Cannot rebase."
>>
>> may be a more sensible improvement.
>
> Let me guess, 'am' alone would be confusing because it follows 'an' in
> the error message.

With a, an or the, or without, 'am' alone, unlike 'status',
'rebase', etc., do not look much like a subcommand name, and that is
why the original chose to say git-am.  The suggestion is to make the
primary change (i.e. remove mention of dashed form) without changing
or breaking what the original wanted to do.

```

## Kaartic Sivaraam, 2017-11-20 15:26

Subject: [PATCH] git-rebase: clean up dashed-usages in messages
Message-ID: <20171120152652.9413-1-kaartic.sivaraam@gmail.com>
URL: https://gitlist.dev/e/20171120152652.9413-1-kaartic.sivaraam%40gmail.com
In-Reply-To: <xmqqmv3hokvx.fsf@gitster.mtv.corp.google.com>

```
Signed-off-by: Kaartic Sivaraam <kaartic.sivaraam@gmail.com>
---
 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
 OPTIONS_SPEC="\
 git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] [<branch>]
 git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
-git-rebase --continue | --abort | --skip | --edit-todo
+git rebase --continue | --abort | --skip | --edit-todo
 --
  Available options are
 v,verbose!         display a diffstat of what changed upstream
@@ -216,7 +216,7 @@ run_pre_rebase_hook () {
 }
 
 test -f "$apply_dir"/applying &&
-	die "$(gettext "It looks like git-am is in progress. Cannot rebase.")"
+	die "$(gettext "It looks like 'git am' is in progress. Cannot rebase.")"
 
 if test -d "$apply_dir"
 then
-- 
2.15.0.291.g0d8980c5d


```

## Junio C Hamano, 2017-11-21 00:33

Subject: Re: [PATCH] git-rebase: clean up dashed-usages in messages
Message-ID: <xmqqbmjwlbc2.fsf@gitster.mtv.corp.google.com>
URL: https://gitlist.dev/e/xmqqbmjwlbc2.fsf%40gitster.mtv.corp.google.com
In-Reply-To: <20171120152652.9413-1-kaartic.sivaraam@gmail.com>

```
Kaartic Sivaraam <kaartic.sivaraam@gmail.com> writes:

> Signed-off-by: Kaartic Sivaraam <kaartic.sivaraam@gmail.com>
> ---

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 b/git-rebase.sh
> index 6344e8d5e..2f5d138a0 100755
> --- a/git-rebase.sh
> +++ b/git-rebase.sh
> @@ -9,7 +9,7 @@ OPTIONS_STUCKLONG=t
>  OPTIONS_SPEC="\
>  git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] [<branch>]
>  git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
> -git-rebase --continue | --abort | --skip | --edit-todo
> +git rebase --continue | --abort | --skip | --edit-todo
>  --
>   Available options are
>  v,verbose!         display a diffstat of what changed upstream
> @@ -216,7 +216,7 @@ run_pre_rebase_hook () {
>  }
>  
>  test -f "$apply_dir"/applying &&
> -	die "$(gettext "It looks like git-am is in progress. Cannot rebase.")"
> +	die "$(gettext "It looks like 'git am' is in progress. Cannot rebase.")"
>  
>  if test -d "$apply_dir"
>  then

```