From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 28 Nov 2008 03:23:51 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.1-rc1~15
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=455d0f5c23a600ff8c94642ca5123f1bd2f1ec0d;p=git.git

Merge branch 'maint'

* maint:
  sha1_file.c: resolve confusion EACCES vs EPERM
  sha1_file: avoid bogus "file exists" error message
  git checkout: don't warn about unborn branch if -f is already passed
  bash: offer refs instead of filenames for 'git revert'
  bash: remove dashed command leftovers
  git-p4: fix keyword-expansion regex
  fast-export: use an unsorted string list for extra_refs
  Add new testcase to show fast-export does not always exports all tags
---

455d0f5c23a600ff8c94642ca5123f1bd2f1ec0d