Index: man/src/git-drover.demo.1.sh |
diff --git a/man/src/git-drover.demo.1.sh b/man/src/git-drover.demo.1.sh |
index 29a8cb043f820cfe14e5ed47984bba6c2bc73b13..9b12e380f64cb16bf5ff8279fbbd3097ced6acf6 100755 |
--- a/man/src/git-drover.demo.1.sh |
+++ b/man/src/git-drover.demo.1.sh |
@@ -3,25 +3,20 @@ |
drover_c "This change needs to go to branch 9999" |
-echo "# Make sure we have the most up-to-date branch sources." |
-run git fetch |
-echo |
echo "# Here's a commit (from some.committer) that we want to 'drover'." |
run git log -n 1 --pretty=fuller |
echo |
-echo "# Checkout the branch we want to 'drover' to." |
-run git checkout -b drover_9999 branch-heads/9999 |
-echo |
echo "# Now do the 'drover'." |
-echo "# IMPORTANT!!! Do Not leave off the '-x' flag" |
-run git cherry-pick -x $(git show-ref -s pick_commit) |
+pcommand git drover --branch 9999 \ |
+ --cherry-pick $(git show-ref -s pick_commit) |
+ |
+echo "Going to cherry-pick" |
+echo '"""' |
+output git log -n 1 |
+echo '"""' |
+echo "to 9999. Continue (y/n)? y" |
echo |
-echo "# That took the code authored by some.committer and committed it to" |
-echo "# the branch by the person who drovered it (i.e. you)." |
-run git log -n 1 --pretty=fuller |
+echo "# A cl is uploaded to rietveld, where it can be reviewed before landing." |
echo |
-echo "# Looks good. Ship it!" |
-pcommand git cl upload |
-echo "# Wait for LGTM or TBR it." |
-run git cl land |
-echo "# Or skip the LGTM/TBR and just 'git cl land --bypass-hooks'" |
+echo "About to land on 9999. Continue (y/n)? y" |
+echo "# The cherry-pick cl is landed on the branch 9999." |