tree 23350997a56089356ccaeaa923a783378c198bf6
parent b8d97d07fd5025232cae74cfc9a555abd9ac390e
parent 81fa145917c40b68a5e2cca6afc6a10cdfdbd25b
author Junio C Hamano <gitster@pobox.com> 1204013662 -0800
committer Junio C Hamano <gitster@pobox.com> 1204013662 -0800

Merge branch 'maint'

* maint:
  Documentation/git-am.txt: Pass -r in the example invocation of rm -f .dotest
  timezone_names[]: fixed the tz offset for New Zealand.
  filter-branch documentation: non-zero exit status in command abort the filter
  rev-parse: fix potential bus error with --parseopt option spec handling
  Use a single implementation and API for copy_file()
  Documentation/git-filter-branch: add a new msg-filter example
  Correct fast-export file mode strings to match fast-import standard