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

Side by Side Diff: man/src/depot_tools_tutorial.demo.walkthrough.sh

Issue 436963005: Added hyphen-only options (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master
Patch Set: Fixed options in some calling code 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 unified diff | Download patch
« no previous file with comments | « git_reparent_branch.py ('k') | man/src/git-rebase-update.txt » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/usr/bin/env bash 1 #!/usr/bin/env bash
2 BLANK_DEMO=1 2 BLANK_DEMO=1
3 . demo_repo.sh 3 . demo_repo.sh
4 4
5 trunc() { 5 trunc() {
6 echo ... truncated output ... 6 echo ... truncated output ...
7 } 7 }
8 8
9 trunc_command() { 9 trunc_command() {
10 pcommand "$@" 10 pcommand "$@"
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 add_ws "$ADD3" 113 add_ws "$ADD3"
114 run git commit -am 'beginning of chapter 3' 114 run git commit -am 'beginning of chapter 3'
115 map 115 map
116 116
117 comment "We haven't updated the code in a while, so let's do that now." 117 comment "We haven't updated the code in a while, so let's do that now."
118 pcommand git rebase-update 118 pcommand git rebase-update
119 echo Fetching origin 119 echo Fetching origin
120 git fetch origin 2>&1 | grep -v 'stage' | sed 's+From.*+From https://upstream+' 120 git fetch origin 2>&1 | grep -v 'stage' | sed 's+From.*+From https://upstream+'
121 silent git update-ref refs/remotes/origin/master stage_2 121 silent git update-ref refs/remotes/origin/master stage_2
122 silent git tag -d $(git tag -l 'stage_*') 122 silent git tag -d $(git tag -l 'stage_*')
123 git rebase-update --no_fetch 123 git rebase-update --no-fetch
124 124
125 comment "Well look at that. The CQ landed our typo and chapter2 branches " 125 comment "Well look at that. The CQ landed our typo and chapter2 branches "
126 comment "already and git rebase-update cleaned them up for us." 126 comment "already and git rebase-update cleaned them up for us."
127 trunc_command gclient sync 127 trunc_command gclient sync
128 map 128 map
129 129
130 comment "Someone on IRC mentions that they actually landed a chapter 3 already!" 130 comment "Someone on IRC mentions that they actually landed a chapter 3 already!"
131 comment "We should pull their changes before continuing. Brace for" 131 comment "We should pull their changes before continuing. Brace for"
132 comment "a code conflict!" 132 comment "a code conflict!"
133 pcommand git rebase-update 133 pcommand git rebase-update
(...skipping 12 matching lines...) Expand all
146 run git add "$WS" 146 run git add "$WS"
147 run git diff --cached 147 run git diff --cached
148 148
149 comment "Much better" 149 comment "Much better"
150 run git rebase --continue 150 run git rebase --continue
151 run git rebase-update 151 run git rebase-update
152 silent git tag -d $(git tag -l 'stage_*') 152 silent git tag -d $(git tag -l 'stage_*')
153 trunc_command gclient sync 153 trunc_command gclient sync
154 map 154 map
155 trunc_command git cl upload 155 trunc_command git cl upload
OLDNEW
« no previous file with comments | « git_reparent_branch.py ('k') | man/src/git-rebase-update.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698