From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 12 Aug 2009 23:36:04 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.5-rc0~76
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6ffd781226f04629eff63a684b47ad7555143312;p=git.git

Merge branch 'maint'

* maint:
  push: point to 'git pull' and 'git push --force' in case of non-fast forward
  Documentation: add: <filepattern>... is optional
  Change mentions of "git programs" to "git commands"
  Documentation: merge: one <remote> is required
  help.c: give correct structure's size to memset()
---

6ffd781226f04629eff63a684b47ad7555143312
diff --cc transport.c
index afec5b731,f231b355f..faee154c3
--- a/transport.c
+++ b/transport.c
@@@ -1027,9 -1028,7 +1031,10 @@@ int transport_push(struct transport *tr
  
  		ret = transport->push_refs(transport, remote_refs, flags);
  
 -		print_push_status(transport->url, remote_refs, verbose | porcelain, porcelain, nonfastforward);
 +		if (!quiet || push_had_errors(remote_refs))
 +			print_push_status(transport->url, remote_refs,
- 					verbose | porcelain, porcelain);
++					verbose | porcelain, porcelain,
++					nonfastforward);
  
  		if (!(flags & TRANSPORT_PUSH_DRY_RUN)) {
  			struct ref *ref;