todoon commit Simplify merges even more aggressively. (795e730)
   1
   2        delete tempdir
   3        --annotate-sometimes: only annotate if the patch also changes files
   4          outside the subdir?
   5        'git subtree rejoin' option to do the same as --rejoin, eg. after a
   6          rebase
   7        "-s subtree" should be given an explicit subtree option?
   8