From: Junio C Hamano <junkio@cox.net>
Date: Mon, 30 Jan 2006 01:56:45 +0000 (-0800)
Subject: Merge fixes up to GIT 1.1.6
X-Git-Tag: v1.2.0~97
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=36b5b3c65948694d9a92de5a17f2b97c3cd84879;p=git.git

Merge fixes up to GIT 1.1.6
---

36b5b3c65948694d9a92de5a17f2b97c3cd84879
diff --cc Documentation/git-push.txt
index 365cfd41,29fa3075..a0ef61da
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@@ -29,16 -29,11 +29,16 @@@ 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.
+ 	Usually, the command refuses to update a remote ref that is
+ 	not a descendent of the local ref used to overwrite it.
+ 	This flag disables the check.  This can cause the
+ 	remote repository to lose commits; use it with care.
  
  
  Author