t / t4013 / diff.diff-tree_-r_--abbrev_initialon commit Make cherry-pick use rerere for conflict resolution. (aa1a011)
   1$ git diff-tree -r --abbrev initial
   2$