linux-qubasis

commit 6462caea207dc6f167f485d92c0678ccdde5f754
parent 3b81eb89a74a46df682c505fac8401d59060f6d8
Author: Jul <jul@9o.is>
Date:   Thu, 28 Aug 2025 11:32:54 +0800

use 3way merge to git submodule patches

Diffstat:
M
ninja/sync.sh
 | 
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ninja/sync.sh b/ninja/sync.sh
@@ -56,7 +56,7 @@ sync_git() {
 
     if [ -d $dir/patch ] ; then
         for patch in $dir/patch/*.patch; do
-            git -C $repo am --keep-non-patch --no-gpg-sign \
+            git -C $repo am --3way --keep-non-patch --no-gpg-sign \
                 --whitespace=nowarn ../patch/${patch##*/}
         done
     fi