| ESI15 | a3b89d2 | 2015-11-24 12:34:18 +0530 | [diff] [blame] | 1 | #!/bin/sh |
| 2 | # Automatically merge the last commit through the following branches: |
| 3 | # Integration-Releases -} master |
| 4 | |
| 5 | CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD) |
| 6 | LAST_COMMIT=$(git rev-list -1 HEAD) |
| 7 | |
| 8 | echo Automatically merging commit $LAST_COMMIT from $CURRENT_BRANCH rippling to master |
| 9 | |
| 10 | case $CURRENT_BRANCH in |
| 11 | Integration-Releases) |
| 12 | #git checkout Integration-Releases |
| 13 | #git merge $CURRENT_BRANCH |
| 14 | git checkout master |
| 15 | git merge $CURRENT_BRANCH |
| 16 | git checkout $CURRENT_BRANCH |
| 17 | ;; |
| 18 | esac |