From f62778011ce8c3ef495038539976bb176f701105 Mon Sep 17 00:00:00 2001
From: Roland Conybeare <rconybeare@gmail.com>
Date: Sat, 23 May 2026 11:03:39 -0400
Subject: [PATCH] xo-cmake: xo-build: --rejoin on subtree ops

---
 bin/xo-build.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/xo-build.in b/bin/xo-build.in
index 7bf069f..444bf6d 100644
--- a/bin/xo-build.in
+++ b/bin/xo-build.in
@@ -291,7 +291,7 @@ fi
 if [[ $pull_umbrella_remote_flag -eq 1 ]]; then
     if [[ -n "$xoname" ]]; then
         branch=$(git branch --show-current)
-        cmd="git subtree pull --prefix=$xoname $xoname ${branch}"
+        cmd="git subtree pull --rejoin --prefix=$xoname $xoname ${branch}"
 
         if [[ $noop_flag -eq 1 ]]; then
             echo $cmd
@@ -304,7 +304,7 @@ fi
 if [[ $push_umbrella_remote_flag -eq 1 ]]; then
     if [[ -n "$xoname" ]]; then
         branch=$(git branch --show-current)
-        cmd="git subtree push --prefix=$xoname $xoname ${branch}"
+        cmd="git subtree push --rejoin --prefix=$xoname $xoname ${branch}"
 
         if [[ $noop_flag -eq 1 ]]; then
             echo $cmd