diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-07-13 11:24:14 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-07-13 11:24:14 -0700 |
commit | ce18123cec7674b58bb57272fdfa28de6ecc6b18 (patch) | |
tree | fce7f39f74bb41dd3dc6d730752c24fc4ddda2c9 /Documentation/git-fast-import.txt | |
parent | fc8a3a607227297a5ec7b0ac60173a82b84b248f (diff) | |
parent | 661c3e9bc064564a492281364413dc805eaddf95 (diff) | |
download | git-ce18123cec7674b58bb57272fdfa28de6ecc6b18.tar.gz git-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/git-fast-import.txt')
-rw-r--r-- | Documentation/git-fast-import.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index 644df993f..2b762654b 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/git-fast-import.txt @@ -1056,7 +1056,7 @@ relative-marks:: no-relative-marks:: force:: Act as though the corresponding command-line option with - a leading '--' was passed on the command line + a leading `--` was passed on the command line (see OPTIONS, above). import-marks:: @@ -1107,7 +1107,7 @@ options the user may specify to git fast-import itself. The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, -without the leading '--' and is treated in the same way. +without the leading `--` and is treated in the same way. Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option |