Merge branch 'maint'

* maint:
  Cosmetical command name fix
  Start conforming code to "git subcmd" style part 3
  t9700/test.pl: remove File::Temp requirement
  t9700/test.pl: avoid bareword 'STDERR' in 3-argument open()

diff --cc builtin-read-tree.c
Simple merge

diff --cc builtin-update-index.c
Simple merge

diff --cc t/t9700/test.pl
Simple merge