summaryrefslogtreecommitdiff
path: root/Documentation/git-pack-objects.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-06-05 12:00:19 -0700
committerJunio C Hamano <gitster@pobox.com>2015-06-05 12:00:19 -0700
commit96b7f93ac85ba09aaa82ecc86bf14cba481bbdbb (patch)
tree2d99b4b39a05bd23009a763d9ab602cca721bb45 /Documentation/git-pack-objects.txt
parent51f319c08f55beb12cf1e1d4db9299434b9b1496 (diff)
parentd0258b93e6eb95dd1169693dbcf12f0ae6f6a2eb (diff)
downloadgit-96b7f93ac85ba09aaa82ecc86bf14cba481bbdbb.tar.xz
Merge branch 'jk/asciidoc-markup-fix' into maint
Various documentation mark-up fixes to make the output more consistent in general and also make AsciiDoctor (an alternative formatter) happier. * jk/asciidoc-markup-fix: doc: convert AsciiDoc {?foo} to ifdef::foo[] doc: put example URLs and emails inside literal backticks doc: drop backslash quoting of some curly braces doc: convert \--option to --option doc/add: reformat `--edit` option doc: fix length of underlined section-title doc: fix hanging "+"-continuation doc: fix unquoted use of "{type}" doc: fix misrendering due to `single quote'
Diffstat (limited to 'Documentation/git-pack-objects.txt')
-rw-r--r--Documentation/git-pack-objects.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt
index c2f76fb1ea..bbea5294ca 100644
--- a/Documentation/git-pack-objects.txt
+++ b/Documentation/git-pack-objects.txt
@@ -192,7 +192,7 @@ self-contained. Use `git index-pack --fix-thin`
--shallow::
Optimize a pack that will be provided to a client with a shallow
- repository. This option, combined with \--thin, can result in a
+ repository. This option, combined with --thin, can result in a
smaller pack at the cost of speed.
--delta-base-offset::