diff options
| author | Yasushi SHOJI <yashi@atmark-techno.com> | 2005-09-12 02:29:10 +0900 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-09-11 10:51:36 -0700 |
| commit | e1ccf53a60657930ae7892387736c8b6a91ec610 (patch) | |
| tree | 8757764549bc6e034e21d29da780b946c39ee760 /Documentation/tutorial.txt | |
| parent | 2c865d9aa7b9c3511f901b2544b667c5188f510e (diff) | |
| download | git-e1ccf53a60657930ae7892387736c8b6a91ec610.tar.gz git-e1ccf53a60657930ae7892387736c8b6a91ec610.tar.xz | |
[PATCH] Escape asciidoc's built-in em-dash replacement
AsciiDoc replace '--' with em-dash (—) by default. em-dash
looks a lot like a single long dash and it's very confusing when
we are talking about command options.
Section 21.2.8 'Replacements' of AsciiDoc's User Guide says that a
backslash in front of double dash prevent the replacement. This
patch does just that.
Signed-off-by: Yasushi SHOJI <yashi@atmark-techno.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/tutorial.txt')
| -rw-r--r-- | Documentation/tutorial.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt index 6e100dbb6..928a22cd7 100644 --- a/Documentation/tutorial.txt +++ b/Documentation/tutorial.txt @@ -828,7 +828,7 @@ which will very loudly warn you that you're now committing a merge (which is correct, so never mind), and you can write a small merge message about your adventures in git-merge-land. -After you're done, start up `gitk --all` to see graphically what the +After you're done, start up `gitk \--all` to see graphically what the history looks like. Notice that `mybranch` still exists, and you can switch to it, and continue to work with it if you want to. The `mybranch` branch will not contain the merge, but next time you merge it @@ -883,7 +883,7 @@ not actually do a merge. Instead, it just updated the top of the tree of your branch to that of the `master` branch. This is often called 'fast forward' merge. -You can run `gitk --all` again to see how the commit ancestry +You can run `gitk \--all` again to see how the commit ancestry looks like, or run `show-branch`, which tells you this. ------------------------------------------------ |