From mboxrd@z Thu Jan 1 00:00:00 1970 From: Richard Hartmann Subject: [PATCH 5/6] templates: Fix ASCII art in pre-rebase hook Date: Mon, 10 Jun 2013 20:36:04 +0200 Message-ID: <1370889365-6239-6-git-send-email-richih.mailinglist@gmail.com> References: <1370889365-6239-1-git-send-email-richih.mailinglist@gmail.com> Cc: Richard Hartmann To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Mon Jun 10 20:36:28 2013 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Um6x9-00059Y-L6 for gcvg-git-2@plane.gmane.org; Mon, 10 Jun 2013 20:36:27 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754190Ab3FJSgV (ORCPT ); Mon, 10 Jun 2013 14:36:21 -0400 Received: from mail-ee0-f52.google.com ([74.125.83.52]:58659 "EHLO mail-ee0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754010Ab3FJSgT (ORCPT ); Mon, 10 Jun 2013 14:36:19 -0400 Received: by mail-ee0-f52.google.com with SMTP id c50so3211488eek.25 for ; Mon, 10 Jun 2013 11:36:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=FABy3hTS4h1IRB93AeDWPAn7D7iaM5fBDiZYOFDFLmE=; b=ugHChSOl747T0mi3UPumsHhBCBjNSRmKHLwA7igxyLOves6YfY7Z0CBtT/fb/I/09W 9MRHrcdVk4FVDNi6OuHWPB35f5yhhp/cQuL5L01IHM4ass4t0HT6w6orMTuYBGEZhYB8 90tt6Bo4A9aaS3VGffDz2icGJFNom/0jxS8T9hpeBdzjerQkw/LYJH4kzKGIejJr9ZV0 9n9e0PblCOgb+Y3zAhG+WyoSezs6Y8lPhX+AwkOrYVOilrdgPEKuzHwERh4s8gpFQFhI +1Tflbr76nWfPCaG+cWrQbqonlhuIU2ExDjBcTQCHf2kL8JLix0O9owRBzgxsGnuSqMy 9bZA== X-Received: by 10.15.98.203 with SMTP id bj51mr12835471eeb.22.1370889378398; Mon, 10 Jun 2013 11:36:18 -0700 (PDT) Received: from rockhopper.fritz.box (p54998111.dip0.t-ipconnect.de. [84.153.129.17]) by mx.google.com with ESMTPSA id ba7sm24960845eeb.0.2013.06.10.11.36.17 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 10 Jun 2013 11:36:17 -0700 (PDT) X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1370889365-6239-1-git-send-email-richih.mailinglist@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: The example assumes 8-char wide tabs and breaks for people with 4-char wide tabs. 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" -- 1.7.10.4