Junio C Hamano 1a4269ff95 Merge branch 'master' into next ...

* master:
  git-grep: Fix problems with recently added tests
  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:16:19 -07:00

20 KiB

Executable File

Raw Blame History

View Raw