From: Junio C Hamano Date: Mon, 10 Jun 2013 19:51:35 GMT Subject: Re: [PATCH 5/6] templates: Fix ASCII art in pre-rebase hook Message-ID: <7vppvtg2wo.fsf@alter.siamese.dyndns.org> In-Reply-To: <1370889365-6239-6-git-send-email-richih.mailinglist@gmail.com> 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"