summaryrefslogtreecommitdiff
path: root/Documentation/git-push.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-06-05 19:00:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-06-05 19:00:19 (GMT)
commit96b7f93ac85ba09aaa82ecc86bf14cba481bbdbb (patch)
tree2d99b4b39a05bd23009a763d9ab602cca721bb45 /Documentation/git-push.txt
parent51f319c08f55beb12cf1e1d4db9299434b9b1496 (diff)
parentd0258b93e6eb95dd1169693dbcf12f0ae6f6a2eb (diff)
downloadgit-96b7f93ac85ba09aaa82ecc86bf14cba481bbdbb.zip
git-96b7f93ac85ba09aaa82ecc86bf14cba481bbdbb.tar.gz
git-96b7f93ac85ba09aaa82ecc86bf14cba481bbdbb.tar.bz2
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-push.txt')
-rw-r--r--Documentation/git-push.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index 863c30c..135d810 100644
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -265,8 +265,8 @@ origin +master` to force a push to the `master` branch). See the
--[no-]verify::
Toggle the pre-push hook (see linkgit:githooks[5]). The
- default is \--verify, giving the hook a chance to prevent the
- push. With \--no-verify, the hook is bypassed completely.
+ default is --verify, giving the hook a chance to prevent the
+ push. With --no-verify, the hook is bypassed completely.
include::urls-remotes.txt[]