From f1fa927adfd3d01d732c22cd376b977d5d1f71bc Mon Sep 17 00:00:00 2001
From: "Charlton, Scott R" <charlton@usgs.gov>
Date: Sun, 31 Oct 2021 18:20:51 +0000
Subject: [PATCH] git subtree pull now squashes

---
 .gitlab-ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 764e2204..10dced62 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,7 @@
 #
 # https://code.chs.usgs.gov/coupled/subtrees/iphreeqc-src
 # SRC 2020-12-02T18:39:55-07:00
+# SRC 2021-10-31T12:20:11-06:00  -- changed pull to squash -- HEAD:f715edb5897985acf0692d2b0bde4ab34379469f
 #
 image: ${CI_REGISTRY}/coupled/containers/buildpack-deps:bionic-scm
 
@@ -81,7 +82,8 @@ subtree-sync:
       export GIT_EDITOR=true
 
       for remote in "${!urls[@]}"; do
-        git_subtree "pull" "${prefixes[$remote]}" "$remote" "${urls[$remote]}"
+        # git_subtree "pull" "${prefixes[$remote]}" "$remote" "${urls[$remote]}"
+        git subtree pull --prefix "${prefixes[$remote]}" --squash "${urls[$remote]}" master
       done
 
       for remote in "${!urls[@]}"; do