From ab3efa6b285d905e4fc6fd9f0b8eaecf2eb4094a Mon Sep 17 00:00:00 2001 From: gumi Date: Mon, 30 Jan 2017 19:21:45 -0500 Subject: add music to the hercules wrapper --- herculeswrapper/include.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'herculeswrapper/include.sh') diff --git a/herculeswrapper/include.sh b/herculeswrapper/include.sh index d251f9b..aecb988 100644 --- a/herculeswrapper/include.sh +++ b/herculeswrapper/include.sh @@ -253,6 +253,19 @@ function git_merge { do try_merge $branch done + + run cd $evol_music + + run git fetch --all + run git reset --hard $music_main_branch + info 'commit=$(' git rev-parse --verify -q $music_main_branch ')' + commit=$(git rev-parse --verify -q $music_main_branch) + info2 music base $music_main_branch $commit >> $motd + for branch in ${music_extra_branches[@]} + do + try_merge $branch + done + echo '"End of Commits";' >> $motd echo -e ' return;\n}' >> $motd -- cgit v1.2.3-70-g09d2