Hi Junio,
Junio C Hamano <gitster@xxxxxxxxx> wrote:
> Jan Krüger <jk@xxxxx> writes:
>> diff --git a/git-am.sh b/git-am.sh
>> index 87ffae2..43ea52c 100755
>> --- a/git-am.sh
>> +++ b/git-am.sh
>> @@ -726,6 +726,8 @@ do
>> resolved=
>> git diff-index --quiet --cached HEAD -- && {
>> echo "No changes - did you forget to use 'git add'?"
>> + echo "If there is nothing left to stage, chances are that something else"
>> + echo "already introduced the same changes; you might want to skip this patch."
>
> The exact wording I'd let people to fight out, but I think this is
> probably better than Ramkumar's one that says "if you dropped". The user
> may not know that he is doing an equivalent of dropping as a side effect
> of the new base that had accepted the same change, and your message nudges
> the reader to realize that.
I didn't see this patch on the list- did Jan send it to the list?
Yeah, the wording here is nicer, except you might also want to include
an explicit note on using "$cmdline --skip".
-- Ram
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html