Merge branch 'rs/subtree-fixes'
authorJunio C Hamano <gitster@pobox.com>
Fri, 26 Oct 2018 05:22:08 +0000 (14:22 +0900)
committerJunio C Hamano <gitster@pobox.com>
Fri, 26 Oct 2018 05:22:08 +0000 (14:22 +0900)
commite7b07376e5fe416e9aab571e4711e630f9387886
tree0ca66738a559c2e2140cbe969cdf309c92895518
parentc4df23f7927d8d00e666a3c8d1b3375f1dc8a3c1
parent19ad68d95d6f8104eca1e86f8d1dfae50c7fb268
Merge branch 'rs/subtree-fixes'

Various subtree fixes.

* rs/subtree-fixes:
  subtree: performance improvement for finding unexpected parent commits
  subtree: improve decision on merges kept in split
  subtree: use commits before rejoins for splits
  subtree: make --ignore-joins pay attention to adds
  subtree: refactor split of a commit into standalone method