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

diff --cc builtin-fast-export.c
Simple merge

diff --cc builtin-init-db.c
Simple merge

diff --cc builtin-rerere.c
Simple merge

diff --cc cache.h
Simple merge

diff --cc diff.c
Simple merge