Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Timothe Litt
BIND
Commits
6a06397b
Commit
6a06397b
authored
Mar 18, 2013
by
Evan Hunt
Browse files
[master] silence unnecessary output
parent
030993f4
Changes
1
Hide whitespace changes
Inline
Side-by-side
util/branchsync.sh
View file @
6a06397b
...
...
@@ -10,6 +10,9 @@
# commit that went cleanly, and send mail -- or, if running in interactive
# 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:
# branchsync.sh [ -i ] [ -c ]
# -i: interactive mode (don't reset and send mail)
...
...
@@ -71,10 +74,10 @@ if [ -z "$continuing" ]; then
fi
# make sure both branches are synced to the source repository
git pull origin
$BRANCH
git checkout
-f
$SOURCEBRANCH
git pull origin
$SOURCEBRANCH
git checkout
-f
$BRANCH
git pull origin
$BRANCH
>
/dev/null 2>&1
git checkout
-f
$SOURCEBRANCH
>
/dev/null 2>&1
git pull origin
$SOURCEBRANCH
>
/dev/null 2>&1
git checkout
-f
$BRANCH
>
/dev/null 2>&1
fi
# loop through commits looking for ones that should be cherry-picked
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment