From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 23 Apr 2008 07:03:56 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.6-rc0~126
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=57cf5ca3058b4086744f59f1f520a15dfc040bbb;p=git.git

Merge branch 'maint'

* maint:
  Amend git-push refspec documentation
  git-gc --prune is deprecated
  svn-git: Use binmode for reading/writing binary rev maps
  diff options documentation: refer to --diff-filter in --name-status
  Don't force imap.host to be set when imap.tunnel is set
  git-clone.txt: Adjust note to --shared for new pruning behavior of git-gc
  git-svn bug with blank commits and author file
  archive.c: format_subst - fixed bogus argument to memchr
  copy.c: copy_fd - correctly report write errors
  gitattributes: Fix subdirectory attributes specified from root directory
---

57cf5ca3058b4086744f59f1f520a15dfc040bbb