Junio C Hamano fb674d7671 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'

2011-05-30 00:09:55 -07:00

18 KiB

Raw Blame History

View Raw