Re: [PATCH 5/6] templates: Fix ASCII art in pre-rebase hook

[Jonathan Nieder]

Richard Hartmann wrote:

> The example assumes 8-char wide tabs and breaks for people with
> 4-char wide tabs. Convert all of those tabs to whitespace, instead.

Makes sense --- we cannot assume much about the end-user's editor
setup used to look at sample hooks.

Thanks.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 5/6] templates: Fix ASCII art in pre-rebase hook

[Jeff King]

On Mon, Jun 10, 2013 at 08:36:04PM +0200, Richard Hartmann wrote:

> The example assumes 8-char wide tabs and breaks for people with
> 4-char wide tabs.

If you end up re-rolling, it might be worth saying "Let's just convert
all of the tabs to spaces" in the commit message. I was curious what
your solution was (all spaces, or consistent start-tab indentation
followed by spaces), and it was somewhat hard to see in the patch since
the changes were pure whitespace. :)

-Peff
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 5/6] templates: Fix ASCII art in pre-rebase hook

[Junio C Hamano]

Richard Hartmann  writes:

> The example assumes 8-char wide tabs and breaks for people with
> 4-char wide tabs.

Even though as far as this project is concerned, a tab stop is every
8 columns, this is for consumption by end-users who use Git, not for
people who want to improve the code in Git (which this file is part
of), so this "untabify" may make sense.

Thanks.

> Signed-off-by: Richard Hartmann 
> ---
>  templates/hooks--pre-rebase.sample |   16 
>  1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/templates/hooks--pre-rebase.sample 
> b/templates/hooks--pre-rebase.sample
> index 053f111..b74cd1d 100755
> --- a/templates/hooks--pre-rebase.sample
> +++ b/templates/hooks--pre-rebase.sample
> @@ -132,14 +132,14 @@ With this workflow, you would want to know:
>  
>  Let's look at this example:
>  
> -o---o---o---o---o---o---o---o---o---o "next"
> -   /   /   /   /
> -  /   a---a---b A /   /
> - /   /   /   /
> -/   /   c---c---c---c B /
> -   /   /   / \ /
> -  /   /   /   b---b C \   /
> - /   /   /   / \ /
> +   o---o---o---o---o---o---o---o---o---o "next"
> +  /   /   /   /
> + /   a---a---b A /   /
> +/   /   /   /
> +   /   /   c---c---c---c B /
> +  /   /   / \ /
> + /   /   /   b---b C \   /
> +/   /   /   / \ /
>  ---o---o---o---o---o---o---o---o---o---o---o "master"
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html