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()

diff --cc Documentation/config.txt
Simple merge

diff --cc Documentation/git-rev-list.txt
Simple merge

diff --cc builtin-push.c
Simple merge

diff --cc transport.c
index afec5b731aa39f8bf9d647528c1a314bf677a26b,f231b355f24476372c9b89c35a41231a18e45719..faee154c383c9726017f1995121b510f770b655e
--- 1/transport.c
--- 2/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;

diff --cc transport.h
Simple merge