Skip to content
  • Junio C Hamano's avatar
    Merge branch 'maint' · fb674d76
    Junio C Hamano authored
    * 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'
    fb674d76