[PATCH 5/6] templates: Fix ASCII art in pre-rebase hook
- From
Richard Hartmann <richih.mailinglist@gmail.com>
- Date
- Jul 14, 2013, 16:21 UTC
- Message-ID
- <1373818879-1698-6-git-send-email-richih.mailinglist@gmail.com>
- In-Reply-To
- <1373818879-1698-1-git-send-email-richih.mailinglist@gmail.com>
The example assumes 8-char wide tabs and breaks for people with 4-char wide tabs. Convert all of those tabs to whitespace, instead.
Verbatim copy of 11edd8a05778700382e6a21cfc0a6b5b72eff852 in original patch series from 2013-06-10.
Signed-off-by: Richard Hartmann <richih.mailinglist@gmail.com> --- 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"
-- 1.7.10.4