From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 26 Feb 2008 08:14:22 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.5-rc0~148
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2db511fdbdbe1c8aab80f4bc13f0df037bce8a33;p=git.git

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

2db511fdbdbe1c8aab80f4bc13f0df037bce8a33