From a330bc51e33350cf81008c29742fe570fae074da Mon Sep 17 00:00:00 2001
From: Darth Vader <darth@empire.com>
Date: Sun, 31 Oct 2021 18:57:52 +0000
Subject: [PATCH] Squashed 'phreeqcpp/' changes from 2243d25..7e50e98

7e50e98 Merge commit 'df6addc21acd81411e81b36a9daf373b10cba255'
df6addc Squashed 'common/' changes from 077abe0..013c822
5bc41df git subtree pull now squashes

git-subtree-dir: phreeqcpp
git-subtree-split: 7e50e9840fd9a15a541345f02fbcbfed5b09dd8e
---
 .gitlab-ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 25c56f8c..9c8a9fed 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,7 @@
 #
 # https://code.chs.usgs.gov/coupled/subtrees/phreeqc3-src
 # SRC 2020-12-02T18:39:55-07:00
+# SRC 2021-10-31T12:53:15-06:00  -- changed pull to squash -- HEAD:2243d25babbc524e7875b3d591bb6b91c4399a95
 #
 image: ${CI_REGISTRY}/coupled/containers/buildpack-deps:bionic-scm
 
@@ -72,7 +73,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