From 9b3558899b203aa48eaa5d1f8e36dda506fcd6cb Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Fri, 30 Oct 2015 00:02:19 +0100 Subject: [PATCH] travis-apidoc: swap 'relevant' and 'boilerplate' commits --- build-utils/travis-apidoc.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/build-utils/travis-apidoc.sh b/build-utils/travis-apidoc.sh index 894f725da..67f4bdea7 100755 --- a/build-utils/travis-apidoc.sh +++ b/build-utils/travis-apidoc.sh @@ -82,6 +82,13 @@ cd ../doc git add --all . git commit -m "[boilerplate] $COMMIT_MSG" +# Reorder/swap commits, to have "relevant" after "boilerplate". +# This makes it show up earlier in the Github interface etc. +git tag _old +git reset --hard HEAD~2 +git cherry-pick _old _old~1 +git tag -d _old + git checkout "$BRANCH" git merge --no-ff -m "$COMMIT_MSG" merged-update