From 325a3cce5528155c966a06f465db4bbf74e1c142 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ibhear=20=C3=93=C2=A0hAnluain?= Date: Fri, 29 Jun 2018 11:00:53 +0100 Subject: [PATCH] 1 breaking bug fix and 1 typo - largeFile-setup.sh corrected to call simple-setup.sh and not merge-setup.sh, the script's original name. - gitDemo.sh makes reference in one of the commit comments to a client-specific naming convention. Nothing major, but removing it for consistency's sake. --- gitDemo.sh | 2 +- largeFile-setup.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gitDemo.sh b/gitDemo.sh index 1398767..60a88b9 100755 --- a/gitDemo.sh +++ b/gitDemo.sh @@ -6330,7 +6330,7 @@ declaim "Developer 1 updates their 2nd release branch working area following the cd ${BASEDIR}/javaBootcampNoEclipse.dev1 git fetch --prune git checkout REL2019.02_dev1 -git merge -m "Updating my dev branch with the 18.5 release" origin/REL2019.02 +git merge -m "Updating my dev branch with the 2018.11 release" origin/REL2019.02 git push origin sleepies 15 diff --git a/largeFile-setup.sh b/largeFile-setup.sh index 81c7276..281e277 100755 --- a/largeFile-setup.sh +++ b/largeFile-setup.sh @@ -13,7 +13,7 @@ declaim () { REPO_DIR=${SCRIPT_DIR}/largeFileRepo -${SCRIPT_DIR}/merge-setup.sh ${REPO_DIR} +${SCRIPT_DIR}/simple-setup.sh ${REPO_DIR} cd ${REPO_DIR}