From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 30 May 2011 07:09:55 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.6-rc0~17
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=fb674d767180354d9ad3e69f1d41bee98df6bfe9;p=git.git

Merge branch 'maint'

* maint:
  git-submodule.sh: separate parens by a space to avoid confusing some shells
  Documentation/technical/api-diff.txt: correct name of diff_unmerge()
  read_gitfile_gently: use ssize_t to hold read result
  remove tests of always-false condition
  rerere.c: diagnose a corrupt MERGE_RR when hitting EOF between TAB and '\0'
---

fb674d767180354d9ad3e69f1d41bee98df6bfe9