On Sat, Aug 6, 2011 at 3:26 AM, Junio C Hamano <gitster@xxxxxxxxx> wrote:
> Jon Seymour <jon.seymour@xxxxxxxxx> writes:
>
>> diff --git a/git-filter-branch.sh b/git-filter-branch.sh
>> index 962a93b..0d399aa 100755
>> --- a/git-filter-branch.sh
>> +++ b/git-filter-branch.sh
>> @@ -98,11 +98,11 @@ set_ident () {
>> }
>>
>> USAGE="[--env-filter <command>] [--tree-filter <command>]
>> - [--index-filter <command>] [--parent-filter <command>]
>> - [--msg-filter <command>] [--commit-filter <command>]
>> - [--tag-name-filter <command>] [--subdirectory-filter <directory>]
>> - [--original <namespace>] [-d <directory>] [-f | --force]
>> - [<rev-list options>...]"
>> + [--index-filter <command>] [--parent-filter <command>]
>> + [--msg-filter <command>] [--commit-filter <command>]
>> + [--tag-name-filter <command>] [--subdirectory-filter <directory>]
>> + [--original <namespace>] [-d <directory>] [-f | --force]
>> + [<rev-list options>...]"
>>
>> OPTIONS_SPEC=
>> . git-sh-setup
>
> Everything other than this hunk is unquestionably fine. I think this one
> also is Ok but I wonder where the "Indented by 12 columns" comes
> from. "Usage: git filter-branch " that is prefixed to the first line is 25
> columns long, so the "[--index-filter ..." on the second line would not
> align with "[--env-filter ..." on the first line to begin with.
>
> And I do not think they need to align --- the point is if the second and
> subsequent lines do not aim to align with anything on the first line, it
> is just fine to indent them with a single HT, I think
>
I double checked the actual output (e.g. with git filter-branch --X) and
on the screen the output looks identical, although there is still whitespace
difference. So, I think it is ok.
jon.
--
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