t / t4013 / diff.diff-tree_--pretty=oneline_--patch-with-raw_initialon commit Make cherry-pick use rerere for conflict resolution. (aa1a011)
   1$ git diff-tree --pretty=oneline --patch-with-raw initial
   2$