Here is my local hack for using git am in tools/libxfs-apply. What would be the best way to integrate it for real? --- tools/libxfs-apply | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libxfs-apply b/tools/libxfs-apply index deb9c225..923dc10f 100755 --- a/tools/libxfs-apply +++ b/tools/libxfs-apply @@ -396,7 +396,7 @@ apply_patch() fi else echo "Applying with patch utility:" - patch -p1 < $_new_patch.2 + git am -s $_new_patch.2 echo "Patch was applied in $REPO; check for rejects, etc" fi -- 2.26.2
