Merge branch 'maint'
commit6ffd781226f04629eff63a684b47ad7555143312
authorJunio C Hamano <gitster@pobox.com>
Wed, 12 Aug 2009 23:36:04 +0000 (12 16:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 12 Aug 2009 23:36:04 +0000 (12 16:36 -0700)
treee41ea02c886afd117f51b257d57f84043e447efd
parent19a7fcbf16276321f83e0c1748b3935a2ea42675
parent2cd9c2aff0d65bbce704a68d9cbe7a17e02257fe
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()
Documentation/config.txt
Documentation/git-rev-list.txt
builtin-push.c
transport.c
transport.h