eibhearPublic/GitDeepDive
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

1 breaking bug fix and 1 typo

Browse source 
- 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.
This commit is contained in:
Éibhear Ó hAnluain 2018-06-29 11:00:53 +01:00
parent cd3e598051
commit 325a3cce55
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gitDemo.sh
View file

@ -6330,7 +6330,7 @@ declaim "Developer 1 updates their 2nd release branch working area following the
cd ${BASEDIR}/javaBootcampNoEclipse.dev1 cd ${BASEDIR}/javaBootcampNoEclipse.dev1
git fetch --prune git fetch --prune
git checkout REL2019.02_dev1 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 git push origin
sleepies 15 sleepies 15

2
largeFile-setup.sh
View file

@ -13,7 +13,7 @@ declaim () {
REPO_DIR=${SCRIPT_DIR}/largeFileRepo REPO_DIR=${SCRIPT_DIR}/largeFileRepo
${SCRIPT_DIR}/merge-setup.sh ${REPO_DIR} ${SCRIPT_DIR}/simple-setup.sh ${REPO_DIR}
cd ${REPO_DIR} cd ${REPO_DIR}