1. #!/bin/bash
    2. function git_method()
    3. {
    4. for i in ${dir_list[*]};
    5. do
    6. cd $i
    7. echo `pwd`
    8. echo " "
    9. branch=`git branch --show-current`;
    10. if [[ $local_branch==$branch ]];
    11. then
    12. git checkout $origin_branch && git pull origin $origin_branch && echo "pull from $origin_branch";
    13. elif [[ $branch==$origin_branch ]];
    14. then
    15. git pull origin $origin_branch && echo "pull from $origin_branch";
    16. else
    17. echo "no current branch";
    18. fi;
    19. git checkout $local_branch;git merge -m "ok ,merge from $origin_branch" --stat $origin_branch;
    20. echo " "
    21. echo " "
    22. echo " "
    23. done
    24. }
    25. # #########################################################
    26. # #########################################################
    27. # agility-live agility-live-daiyi-dev
    28. dir_list[0]=/Users/daiyi/work-alibaba/git-work/enterPrise-EDITION/sls_j/product-sls
    29. dir_list[1]=/Users/daiyi/work-alibaba/git-work/enterPrise-EDITION/sls_j/service-sls-backend-server
    30. origin_branch="agility-live"
    31. local_branch="agility-live-daiyi-dev"
    32. git_method
    33. # #########################################################
    34. # #########################################################
    35. # master master-daiyi-dev
    36. unset dir_list
    37. dir_list[0]=/Users/daiyi/work-alibaba/git-work/sls-service-test
    38. dir_list[1]=/Users/daiyi/work-alibaba/git-work/sls-tianji-app
    39. dir_list[2]=/Users/daiyi/work-alibaba/git-work/enterPrise-EDITION/sls_j/product-sls
    40. dir_list[3]=/Users/daiyi/work-alibaba/git-work/enterPrise-EDITION/sls_j/service-sls-backend-server
    41. origin_branch="master"
    42. local_branch="master-daiyi-dev"
    43. git_method
    44. # #########################################################
    45. # #########################################################
    46. # ## live live-daiyi-dev
    47. unset dir_list
    48. dir_list[0]=/Users/daiyi/work-alibaba/git-work/enterPrise-EDITION/sls_j/service-sls-backend-server
    49. origin_branch="live"
    50. local_branch="live-daiyi-dev"
    51. git_method
    52. # #########################################################
    53. # #########################################################
    54. # ## v3.11xR v3.11xR-daiyi
    55. unset dir_list
    56. dir_list[0]=/Users/daiyi/work-alibaba/git-work/sls-tianji-app
    57. origin_branch="v3.11xR"
    58. local_branch="v3.11xR-daiyi-dev"
    59. git_method