max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-15 16:18:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Squashed 'src/' changes from f715edb5..0a194dc6

Browse Source 
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
This commit is contained in:
Darth Vader 2021-10-31 18:22:56 +00:00
parent 09d8fe4783
commit 615fa476f5
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@ -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