From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 14 Mar 2008 07:16:42 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.5-rc0~17
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=16007f3916b885d29de6c48832aa6a4213ab7588;p=git.git

Merge branch 'maint'

* maint:
  merge-file: handle empty files gracefully
  merge-recursive: handle file mode changes
  Minor wording changes in the keyboard descriptions in git-add --interactive.
  git fetch: Take '-n' to mean '--no-tags'
  quiltimport: fix misquoting of parsed -p<num> parameter
  git-quiltimport: better parser to grok "enhanced" series files.
---

16007f3916b885d29de6c48832aa6a4213ab7588