Merge fixes up to GIT 1.1.5

diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index f45ac5ee4910198fa351e56bb40333612787fcd2..365cfd4105870892306b6376de768b2f0d4b97a3 100644 (file)
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -8,7 +8,7 @@ git-push - Update remote refs along with associated objects.
 
 SYNOPSIS
 --------
-'git-push' [--all] [--force] <repository> <refspec>...
+'git-push' [--all] [--tags] [--force] <repository> <refspec>...
 
 DESCRIPTION
 -----------
@@ -16,6 +16,10 @@ DESCRIPTION
 Updates remote refs using local refs, while sending objects
 necessary to complete the given refs.
 
+You can make "interesting" things to happen on the repository
+every time you push into it, by setting up 'hooks' there.  See
+documentation for gitlink:git-receive-pack[1].
+
 
 OPTIONS
 -------
@@ -25,12 +29,18 @@ include::pull-fetch-param.txt[]
        Instead of naming each ref to push, specifies all refs
        to be pushed.
 
+\--tags::
+       All refs under `$GIT_DIR/refs/tags` are pushed, in
+       addition to refspecs explicitly listed on the command
+       line.
+
 -f, \--force::
        Usually, the command refuses to update a local ref that is
        not an ancestor of the remote ref used to overwrite it.
        This flag disables the check.  What this means is that the
        local repository can lose commits; use it with care.
 
+
 Author
 ------
 Written by Junio C Hamano <junkio@cox.net>