summaryrefslogtreecommitdiff
path: root/Documentation/gitcore-tutorial.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-07-13 11:24:14 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-07-13 11:24:14 -0700
commitce18123cec7674b58bb57272fdfa28de6ecc6b18 (patch)
treefce7f39f74bb41dd3dc6d730752c24fc4ddda2c9 /Documentation/gitcore-tutorial.txt
parentMerge branch 'dg/subtree-rebase-test' (diff)
parentdoc: typeset HEAD and variants as literal (diff)
downloadtgif-ce18123cec7674b58bb57272fdfa28de6ecc6b18.tar.xz
Merge branch 'mm/doc-tt'
More mark-up updates to typeset strings that are expected to literally typed by the end user in fixed-width font. * mm/doc-tt: doc: typeset HEAD and variants as literal CodingGuidelines: formatting HEAD in documentation doc: typeset long options with argument as literal doc: typeset '--' as literal doc: typeset long command-line options as literal doc: typeset short command-line options as literal Documentation/git-mv.txt: fix whitespace indentation
Diffstat (limited to 'Documentation/gitcore-tutorial.txt')
-rw-r--r--Documentation/gitcore-tutorial.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/gitcore-tutorial.txt b/Documentation/gitcore-tutorial.txt
index 15b3bfa8db..4546fa0d75 100644
--- a/Documentation/gitcore-tutorial.txt
+++ b/Documentation/gitcore-tutorial.txt
@@ -949,7 +949,7 @@ for details.
[NOTE]
If there were more commits on the 'master' branch after the merge, the
merge commit itself would not be shown by 'git show-branch' by
-default. You would need to provide '--sparse' option to make the
+default. You would need to provide `--sparse` option to make the
merge commit visible in this case.
Now, let's pretend you are the one who did all the work in