| OLD | NEW |
|---|
| 1 #!/usr/bin/env bash | 1 #!/usr/bin/env bash |
| 2 . git-drover.demo.common.sh | 2 . git-drover.demo.common.sh |
| 3 | 3 |
| 4 drover_c "This change needs to go to branch 9999" | 4 drover_c "This change needs to go to branch 9999" |
| 5 | 5 |
| 6 echo "# Make sure we have the most up-to-date branch sources." | 6 echo "# Make sure we have the most up-to-date branch sources." |
| 7 run git fetch | 7 run git fetch |
| 8 echo | 8 echo |
| 9 echo "# Here's the commit we want to 'drover'." | 9 echo "# Here's a commit (from some.committer) that we want to 'drover'." |
| 10 run git log -n 1 --pretty=fuller | 10 run git log -n 1 --pretty=fuller |
| 11 echo | 11 echo |
| 12 echo "# Checkout the branch we want to 'drover' to." | 12 echo "# Checkout the branch we want to 'drover' to." |
| 13 run git checkout -b drover_9999 branch-heads/9999 | 13 run git checkout -b drover_9999 branch-heads/9999 |
| 14 echo | 14 echo |
| 15 echo "# Now do the 'drover'." | 15 echo "# Now do the 'drover'." |
| 16 echo "# IMPORTANT!!! Do Not leave off the '-x' flag" | 16 echo "# IMPORTANT!!! Do Not leave off the '-x' flag" |
| 17 run git cherry-pick -x $(git show-ref -s pick_commit) | 17 run git cherry-pick -x $(git show-ref -s pick_commit) |
| 18 echo | 18 echo |
| 19 echo "# That took the code authored by some.commiter and commited it to the" | 19 echo "# That took the code authored by some.committer and committed it to" |
| 20 echo "# branch by branch.maintainer (us)." | 20 echo "# the branch by the person who drovered it (i.e. you)." |
| 21 run git log -n 1 --pretty=fuller | 21 run git log -n 1 --pretty=fuller |
| 22 echo | 22 echo |
| 23 echo "# Looks good. Ship it!" | 23 echo "# Looks good. Ship it!" |
| 24 pcommand git cl upload | 24 pcommand git cl upload |
| 25 echo "# Wait for LGTM or TBR it." | 25 echo "# Wait for LGTM or TBR it." |
| 26 run git cl land | 26 run git cl land |
| 27 echo "# Or skip the LGTM/TBR and just 'git cl land --bypass-hooks'" | 27 echo "# Or skip the LGTM/TBR and just 'git cl land --bypass-hooks'" |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 561433002:
Clear up some git-drover docs confusion. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools