FWIW I had to use git filter-branch, cherry-pick the commit from a foreign remote, then resolve the rebase conflicts by hand
Here were the git filter-branch commands ``` # Remove everything except src/parquet git filter-branch -f --tree-filter "find . -not -path './.git' -not -path './.git/*' -not -path './src' -not -path './src/parquet' -not -path './src/parquet/*' -delete" --prune-empty # Move src/parquet to cpp/src/parquet git filter-branch -f --tree-filter 'mkdir -p cpp/src && test -d src/parquet && mv src/parquet cpp/src/parquet || echo "Nothing to do"' HEAD ``` [ Full content available at: https://github.com/apache/parquet-cpp/pull/475 ] This message was relayed via gitbox.apache.org for [email protected]
