Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(659)

Unified Diff: man/src/git-drover.demo.1.sh

Issue 507513002: Add some more context to git-drover tutorial. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « man/man7/depot_tools.7 ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 f0e026775e13d756bc88cd2f388b780db727f5d3..eb3907cfdcdb62abe0e1f664c5a748d8be845a2a 100755
--- a/man/src/git-drover.demo.1.sh
+++ b/man/src/git-drover.demo.1.sh
@@ -18,11 +18,25 @@ comment Before working with branches, you must \'gclient sync \
set_user branch.maintainer
tick 1000
+echo "# Make sure we have the most up-to-date branch sources."
+run git fetch
+echo
+echo "# Here's the commit 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 "# DO NOT leave off the '-x' flag"
+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)
+echo
+echo "# That took the code authored by some.commiter and commited it to the"
+echo "# branch by branch.maintainer (us)."
run git log -n 1 --pretty=fuller
+echo
+echo "# Looks good. Ship it!"
pcommand git cl upload
echo "# Get LGTM or TBR."
run git cl land
+echo "# Or skip the LGTM/TBR and just 'git cl land --bypass-hooks'"
« no previous file with comments | « man/man7/depot_tools.7 ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698