From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 27 Jun 2013 21:38:09 +0000 (-0700)
Subject: Merge branch 'tr/push-no-verify-doc' into maint
X-Git-Tag: v1.8.3.2~9
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1ec379fff8ea033a9d48a4e8006fc0f7aa8830a5?ds=inline;hp=-c

Merge branch 'tr/push-no-verify-doc' into maint

* tr/push-no-verify-doc:
Document push --no-verify
---

1ec379fff8ea033a9d48a4e8006fc0f7aa8830a5
diff --combined Documentation/git-push.txt
index d51481394c,3003140880..df5be268ba
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@@ -9,9 -9,9 +9,9 @@@ git-push - Update remote refs along wit
  SYNOPSIS
  --------
  [verse]
 -'git push' [--all | --mirror | --tags] [-n | --dry-run] [--receive-pack=<git-receive-pack>]
 +'git push' [--all | --mirror | --tags] [--follow-tags] [-n | --dry-run] [--receive-pack=<git-receive-pack>]
  	   [--repo=<repository>] [-f | --force] [--prune] [-v | --verbose] [-u | --set-upstream]
- 	   [<repository> [<refspec>...]]
+ 	   [--no-verify] [<repository> [<refspec>...]]
  
  DESCRIPTION
  -----------
@@@ -117,12 -117,6 +117,12 @@@ already exists on the remote side
  	addition to refspecs explicitly listed on the command
  	line.
  
 +--follow-tags::
 +	Push all the refs that would be pushed without this option,
 +	and also push annotated tags in `refs/tags` that are missing
 +	from the remote but are pointing at committish that are
 +	reachable from the refs being pushed.
 +
  --receive-pack=<git-receive-pack>::
  --exec=<git-receive-pack>::
  	Path to the 'git-receive-pack' program on the remote
@@@ -162,7 -156,8 +162,7 @@@ useful if you write an alias or script 
  	linkgit:git-pull[1] and other commands. For more information,
  	see 'branch.<name>.merge' in linkgit:git-config[1].
  
 ---thin::
 ---no-thin::
 +--[no-]thin::
  	These options are passed to linkgit:git-send-pack[1]. A thin transfer
  	significantly reduces the amount of sent data when the sender and
  	receiver share many of the same objects in common. The default is
@@@ -195,6 -190,11 +195,11 @@@
  	be pushed. If on-demand was not able to push all necessary
  	revisions it will also be aborted and exit with non-zero status.
  
+ --[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.
+ 
  
  include::urls-remotes.txt[]