git ssb

0+

Grey the earthling / gkn.me.uk



Commit ff0213b7a390b719e11862b2187d1610f58652ac

build.sh: merge ff-only

Non-fast-forward merges should not be needed, so avoid attempting them.
Greg K Nicholson committed on 2/24/2018, 7:43:52 PM
Parent: b887adf06ee347aac91ba41c510b8e65acbcefdc

Files changed

build.shchanged
build.shView
@@ -5,13 +5,13 @@
55 git add content/
66 git commit -m "Update content $(date +%F\ %X)"
77 fi && \
88 git checkout master && \
9- git merge content && \
9 + git merge --ff-only content && \
1010 git checkout content && \
11- git merge master && \
11 + git merge --ff-only master && \
1212 git checkout develop && \
13- git merge master && \
13 + git merge --ff-only master && \
1414 git checkout master && \
1515 git push && \
1616 pelican && \
1717 git checkout develop

Built with git-ssb-web