From 615fa476f56b91463f6c10e63b5266f412f87738 Mon Sep 17 00:00:00 2001
From: Darth Vader <darth@empire.com>
Date: Sun, 31 Oct 2021 18:22:56 +0000
Subject: [PATCH] Squashed 'src/' changes from f715edb5..0a194dc6

0a194dc6 Merge commit 'b8745514b6031a2cc548d6a3eab54b6a90031bc1'
b8745514 Squashed 'phreeqcpp/' changes from da9d06b..2243d25
f1fa927a git subtree pull now squashes

git-subtree-dir: src
git-subtree-split: 0a194dc6299629e4cb58adb9d960c034526f2fba
---
 .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