From: Richard Hartmann <richih.mailinglist@gmail.com>
To: git@vger.kernel.org
Cc: Richard Hartmann <richih.mailinglist@gmail.com>
Subject: [PATCH 5/6] templates: Fix ASCII art in pre-rebase hook
Date: Mon, 10 Jun 2013 20:36:04 +0200 [thread overview]
Message-ID: <1370889365-6239-6-git-send-email-richih.mailinglist@gmail.com> (raw)
In-Reply-To: <1370889365-6239-1-git-send-email-richih.mailinglist@gmail.com>
The example assumes 8-char wide tabs and breaks for people with
4-char wide tabs.
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
next prev parent reply other threads:[~2013-06-10 18:36 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-10 18:35 [PATCH 0/4] Janitorial work on hook templates Richard Hartmann
2013-06-10 18:36 ` [PATCH 1/6] templates: Fewer subprocesses in pre-commit hook Richard Hartmann
2013-06-10 19:44 ` Junio C Hamano
2013-06-10 20:39 ` Richard Hartmann
2013-06-10 21:25 ` Jeff King
2013-06-10 18:36 ` [PATCH 2/6] templates: Reformat pre-commit hook's message Richard Hartmann
2013-06-10 19:47 ` Junio C Hamano
2013-06-10 18:36 ` [PATCH 3/6] templates: Fix spelling in pre-commit hook Richard Hartmann
2013-06-10 18:36 ` [PATCH 4/6] Documentation: Update manpage for " Richard Hartmann
2013-06-10 18:36 ` Richard Hartmann [this message]
2013-06-10 19:51 ` [PATCH 5/6] templates: Fix ASCII art in pre-rebase hook Junio C Hamano
2013-06-10 21:29 ` Jeff King
2013-06-10 18:36 ` [PATCH 6/6] template: Fix comment indentation " Richard Hartmann
2013-06-10 19:52 ` Junio C Hamano
2013-06-10 21:46 ` Richard Hartmann
2013-06-10 22:57 ` Junio C Hamano
2013-06-10 23:03 ` Richard Hartmann
2013-07-14 16:21 ` [PATCH 0/6] Update to janitorial work on hook templates Richard Hartmann
2013-07-14 16:21 ` [PATCH 1/6] templates: Use heredoc in pre-commit hook Richard Hartmann
2013-07-14 18:09 ` Jonathan Nieder
2013-07-15 3:22 ` Junio C Hamano
2013-07-14 19:20 ` Junio C Hamano
2013-07-14 20:12 ` Richard Hartmann
2013-07-14 20:20 ` Jonathan Nieder
2013-07-15 16:49 ` Junio C Hamano
2013-07-14 16:21 ` [PATCH 2/6] templates: Reformat pre-commit hook's message Richard Hartmann
2013-07-14 18:42 ` Jonathan Nieder
2013-07-14 16:21 ` [PATCH 3/6] templates: Fix spelling in pre-commit hook Richard Hartmann
2013-07-14 16:21 ` [PATCH 4/6] Documentation: Update manpage for " Richard Hartmann
2013-07-14 18:51 ` Jonathan Nieder
2013-07-15 16:54 ` Junio C Hamano
2013-07-14 16:21 ` [PATCH 5/6] templates: Fix ASCII art in pre-rebase hook Richard Hartmann
2013-07-14 18:52 ` Jonathan Nieder
2013-07-14 16:21 ` [PATCH 6/6] template: Fix comment indentation " Richard Hartmann
2013-07-14 18:53 ` Jonathan Nieder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1370889365-6239-6-git-send-email-richih.mailinglist@gmail.com \
--to=richih.mailinglist@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).