t / t4013 / diff.diff_--no-index_--name-status_dir2_diron commit rebase --rebase-merges: a "merge" into a new root is a fast-forward (9c85a1c)
   1$ git diff --no-index --name-status dir2 dir
   2A       dir/sub
   3$