Skip to content

G
git-tools
Commit 271acf19 authored by huasheng's avatar huasheng
Browse files
Options

udpate tools

parent 0861ce09
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
git_merge_branch.sh
View file @ 271acf19
...@@ -10,6 +10,12 @@ then ...@@ -10,6 +10,12 @@ then
fi fi
current_branch=$(git branch | grep '*' | awk '{print $2}') current_branch=$(git branch | grep '*' | awk '{print $2}')
is_current_branch_in_remote=$(git branch -r | grep "origin/$current_branch" | wc -l)
if [ $is_current_branch_in_remote -eq 0 ]
then
git push origin $current_branch
fi
git pull origin $current_branch git pull origin $current_branch
if [ $? -ne 0 ] if [ $? -ne 0 ]
then then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment