From: Junio C Hamano Date: Fri, 26 Oct 2018 05:22:08 +0000 (+0900) Subject: Merge branch 'rs/subtree-fixes' X-Git-Tag: v2.20.0-rc0~146 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e7b07376e5fe416e9aab571e4711e630f9387886?hp=e7b07376e5fe416e9aab571e4711e630f9387886 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 ---