Commit 6a06397b authored by Evan Hunt's avatar Evan Hunt
Browse files

[master] silence unnecessary output

parent 030993f4
...@@ -10,6 +10,9 @@ ...@@ -10,6 +10,9 @@
# commit that went cleanly, and send mail -- or, if running in interactive # commit that went cleanly, and send mail -- or, if running in interactive
# mode, we stop and allow the user to resolve conflicts. # mode, we stop and allow the user to resolve conflicts.
# #
# NOTE: This does not push changes to the repository; currently that's up
# to the caller.
#
# Usage: # Usage:
# branchsync.sh [ -i ] [ -c ] # branchsync.sh [ -i ] [ -c ]
# -i: interactive mode (don't reset and send mail) # -i: interactive mode (don't reset and send mail)
...@@ -71,10 +74,10 @@ if [ -z "$continuing" ]; then ...@@ -71,10 +74,10 @@ if [ -z "$continuing" ]; then
fi fi
# make sure both branches are synced to the source repository # make sure both branches are synced to the source repository
git pull origin $BRANCH git pull origin $BRANCH > /dev/null 2>&1
git checkout -f $SOURCEBRANCH git checkout -f $SOURCEBRANCH > /dev/null 2>&1
git pull origin $SOURCEBRANCH git pull origin $SOURCEBRANCH > /dev/null 2>&1
git checkout -f $BRANCH git checkout -f $BRANCH > /dev/null 2>&1
fi fi
# loop through commits looking for ones that should be cherry-picked # loop through commits looking for ones that should be cherry-picked
......
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