aiden
/
depot_tools
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improvements and bugfixes to the depot_tools doc generation process.

Browse Source 
Works on linux in addition to OS X now.

TBR=agable@chromium.org
BUG=

Review URL: https://codereview.chromium.org/234733003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@263292 0039d316-1c4b-4281-b951-d872f2087c98
changes/01/332501/1
iannucci@chromium.org 11 years ago
parent f1eccafb1c
commit 3c66983961
25 changed files with 164 additions and 158 deletions
Show Stats Download Patch File Download Diff File

30
docs/html/depot_tools_tutorial.html
Unescape Escape View File

@ -1047,10 +1047,10 @@ It was a Domo-Kuun.
* <span style="font-weight: bold; color: #e42e16">2250f53 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ ozone: evdev: Filter devices by path * <span style="font-weight: bold; color: #e42e16">2250f53 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ ozone: evdev: Filter devices by path
* <span style="font-weight: bold; color: #e42e16">33a7a74 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Always output seccomp error messages to stderr * <span style="font-weight: bold; color: #e42e16">33a7a74 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Always output seccomp error messages to stderr
<span style="font-weight: bold; color: #ffffff">$ git status</span> <span style="font-weight: bold; color: #ffffff">$ git status</span>
On branch fix_typo # On branch fix_typo
Your branch is ahead of 'origin/master' by 1 commit. # Your branch is ahead of 'origin/master' by 1 commit.
(use "git push" to publish your local commits) # (use "git push" to publish your local commits)
#
nothing to commit, working directory clean nothing to commit, working directory clean
<span style="font-weight: bold; color: #ffffff">$ git cl upload -r domo@chromium.org --send-mail</span> <span style="font-weight: bold; color: #ffffff">$ git cl upload -r domo@chromium.org --send-mail</span>
... truncated output ... ... truncated output ...
@ -1066,15 +1066,15 @@ overhead, barely disturbing the thick cigarette smoke. No doubt was left about
when the fan was last cleaned. when the fan was last cleaned.
EOF EOF
<span style="font-weight: bold; color: #ffffff">$ git status</span> <span style="font-weight: bold; color: #ffffff">$ git status</span>
On branch chap2 # On branch chap2
Your branch is up-to-date with 'origin/master'. # Your branch is up-to-date with 'origin/master'.
#
Changes not staged for commit: # Changes not staged for commit:
(use "git add &lt;file&gt;..." to update what will be committed) # (use "git add &lt;file&gt;..." to update what will be committed)
(use "git checkout -- &lt;file&gt;..." to discard changes in working directory) # (use "git checkout -- &lt;file&gt;..." to discard changes in working directory)
#
<span style="color: #e42e16">modified: build/whitespace_file.txt</span> # <span style="color: #e42e16">modified: build/whitespace_file.txt</span>
#
no changes added to commit (use "git add" and/or "git commit -a") no changes added to commit (use "git add" and/or "git commit -a")
</code></pre></div></div><p><div class="paragraph"> Someone on the code review pointed out that our typo-fix has a typo :( We're still working on 'chap2' but we really want to land 'fix_typo', so let's switch over and fix it.</p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git freeze</span> </code></pre></div></div><p><div class="paragraph"> Someone on the code review pointed out that our typo-fix has a typo :( We're still working on 'chap2' but we really want to land 'fix_typo', so let's switch over and fix it.</p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git freeze</span>
<span style="font-weight: bold; color: #ffffff">$ git checkout fix_typo</span> <span style="font-weight: bold; color: #ffffff">$ git checkout fix_typo</span>
@ -1223,7 +1223,7 @@ EOF
* <span style="font-weight: bold; color: #e42e16">33a7a74 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Always output seccomp error messages to stderr * <span style="font-weight: bold; color: #e42e16">33a7a74 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Always output seccomp error messages to stderr
</code></pre></div></div><p><div class="paragraph"> We haven't updated the code in a while, so let's do that now.</p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git rebase-update</span> </code></pre></div></div><p><div class="paragraph"> We haven't updated the code in a while, so let's do that now.</p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git rebase-update</span>
Fetching origin Fetching origin
From /Users/iannucci/chromium/depot_tools/docs/src/demo_repo From https://upstream
beec6f4..59cdb73 master -&gt; origin/master beec6f4..59cdb73 master -&gt; origin/master
Rebasing: chap2 Rebasing: chap2
Rebasing: fix_typo Rebasing: fix_typo
@ -1251,7 +1251,7 @@ Deleted branch chap2 (was 5d26fec).
* <span style="font-weight: bold; color: #e42e16">33a7a74 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Always output seccomp error messages to stderr * <span style="font-weight: bold; color: #e42e16">33a7a74 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Always output seccomp error messages to stderr
</code></pre></div></div><p><div class="paragraph"> Someone on IRC mentions that they actually landed a chapter 3 already! We should pull their changes before continuing. Brace for a code conflict!</p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git rebase-update</span> </code></pre></div></div><p><div class="paragraph"> Someone on IRC mentions that they actually landed a chapter 3 already! We should pull their changes before continuing. Brace for a code conflict!</p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git rebase-update</span>
Fetching origin Fetching origin
From /Users/iannucci/chromium/depot_tools/docs/src/demo_repo From https://upstream
5d26fec..59cdb73 master -&gt; origin/master 5d26fec..59cdb73 master -&gt; origin/master
Rebasing: chap2 Rebasing: chap2
... lots of output, it's a conflict alright :(... ... lots of output, it's a conflict alright :(...

4
docs/html/git-freeze.html
Unescape Escape View File

@ -788,7 +788,7 @@ time you ran git freeze (freshly modified files, new files, etc.).</p></div>
<span style="font-weight: bold; color: #ffffff">$ git freeze</span> <span style="font-weight: bold; color: #ffffff">$ git freeze</span>
<span style="font-weight: bold; color: #ffffff">$ git status --short</span> <span style="font-weight: bold; color: #ffffff">$ git status --short</span>
<span style="font-weight: bold; color: #ffffff">$ git log -n 2 --stat</span> <span style="font-weight: bold; color: #ffffff">$ git log -n 2 --stat</span>
<span style="color: #e7e71c">commit 2903a59a5323dd12438a9b3912a878a546b5d68a</span> <span style="color: #e7e71c">commit 648c29b68da0142bcad41872339f9732c6ec4470</span>
Author: local &lt;local@chromium.org&gt; Author: local &lt;local@chromium.org&gt;
Date: Thu Apr 10 08:54:56 2014 +0000 Date: Thu Apr 10 08:54:56 2014 +0000
@ -800,7 +800,7 @@ Date: Thu Apr 10 08:54:56 2014 +0000
unstaged_deleted_file | 1 <span style="color: #e42e16">-</span> unstaged_deleted_file | 1 <span style="color: #e42e16">-</span>
4 files changed, 2 insertions(+), 1 deletion(-) 4 files changed, 2 insertions(+), 1 deletion(-)
<span style="color: #e7e71c">commit 19e09ed3f4a23417cf46ce0961fc7434132d0295</span> <span style="color: #e7e71c">commit a4e49c2896814f52feec3fc06ef0454962ee6b8c</span>
Author: local &lt;local@chromium.org&gt; Author: local &lt;local@chromium.org&gt;
Date: Thu Apr 10 08:54:56 2014 +0000 Date: Thu Apr 10 08:54:56 2014 +0000

36
docs/html/git-map.html
Unescape Escape View File

@ -835,26 +835,26 @@ configure this, use git <code>config --add depot-tools.map-extra &lt;value&gt;</
<div class="sectionbody"> <div class="sectionbody">
<div class="paragraph"><p>Running <em>git map</em> would result in an output something like: <div class="paragraph"><p>Running <em>git map</em> would result in an output something like:
</p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git map</span> </p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git map</span>
<span style="background-color: #492ee1"></span><span style="font-weight: bold; background-color: #492ee1">* </span><span style="font-weight: bold; color: #e42e16; background-color: #492ee1">a8f0220 </span><span style="color: #19c518"> (</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">frozen_branch</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ FREEZE.unindexed <span style="background-color: #492ee1"></span><span style="font-weight: bold; background-color: #492ee1">* </span><span style="font-weight: bold; color: #e42e16; background-color: #492ee1">d0fb9c7 </span><span style="color: #19c518"> (</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">frozen_branch</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ FREEZE.unindexed
* <span style="font-weight: bold; color: #e42e16">c382556 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ modfile * <span style="font-weight: bold; color: #e42e16">f48f415 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ modfile
* <span style="font-weight: bold; color: #e42e16">06e399f </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ a deleted file * <span style="font-weight: bold; color: #e42e16">4c5b9c0 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ a deleted file
* <span style="font-weight: bold; color: #e42e16">20494d2 </span><span style="color: #19c518"> (</span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">fixit</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ Add neat feature<span style="font-weight: bold"></span><span style="font-weight: bold; color: #ffffff"> &lt;(frozen_branch)</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> * <span style="font-weight: bold; color: #e42e16">f7ce1e4 </span><span style="color: #19c518"> (</span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">fixit</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ Add neat feature<span style="font-weight: bold"></span><span style="font-weight: bold; color: #ffffff"> &lt;(frozen_branch)</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>
* <span style="font-weight: bold; color: #e42e16">f734bbf </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Epic README update * <span style="font-weight: bold; color: #e42e16">3726937 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Epic README update
<span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #e42e16">983a7b8 </span><span style="color: #19c518"> (</span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">cool_feature</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ Respond to CL comments <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #e42e16">14db2e5 </span><span style="color: #19c518"> (</span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">cool_feature</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ Respond to CL comments
<span style="color: #e42e16">|</span> <span style="color: #19c518">|</span> * <span style="font-weight: bold; color: #e42e16">2f53c1f </span><span style="color: #19c518"> (</span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">subfeature</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ integrate with CoolService <span style="color: #e42e16">|</span> <span style="color: #19c518">|</span> * <span style="font-weight: bold; color: #e42e16">ee3f972 </span><span style="color: #19c518"> (</span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">subfeature</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ integrate with CoolService
<span style="color: #e42e16">|</span> <span style="color: #19c518">|</span> * <span style="font-weight: bold; color: #e42e16">b4e5087 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ slick commenting action <span style="color: #e42e16">|</span> <span style="color: #19c518">|</span> * <span style="font-weight: bold; color: #e42e16">4f9f508 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ slick commenting action
<span style="color: #e42e16">|</span> <span style="color: #19c518">|</span><span style="color: #19c518">/</span> <span style="color: #e42e16">|</span> <span style="color: #19c518">|</span><span style="color: #19c518">/</span>
<span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #e42e16">ac10591 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ another improvement<span style="font-weight: bold"></span><span style="font-weight: bold; color: #ffffff"> &lt;(subfeature)</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #e42e16">7d84f85 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ another improvement<span style="font-weight: bold"></span><span style="font-weight: bold; color: #ffffff"> &lt;(subfeature)</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>
<span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #e42e16">088691d </span><span style="color: #19c518"> (</span><span style="color: #d338d3"></span><span style="font-weight: bold; color: #d338d3">spleen_tag</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ Refactor spleen <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #e42e16">27abea4 </span><span style="color: #19c518"> (</span><span style="color: #d338d3"></span><span style="font-weight: bold; color: #d338d3">spleen_tag</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ Refactor spleen
<span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #e42e16">206ceb2 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Add widget <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #e42e16">d8abe73 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Add widget
<span style="color: #e42e16">|</span><span style="color: #e42e16">/</span> <span style="color: #e42e16">|</span><span style="color: #e42e16">/</span>
* <span style="font-weight: bold; color: #e42e16">619ccc9 </span><span style="color: #19c518"> (</span><span style="color: #e42e16">origin/master</span><span style="color: #19c518">, </span><span style="color: #e42e16">origin/HEAD</span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ Make ReflectorImpl use mailboxes<span style="font-weight: bold"></span><span style="font-weight: bold; color: #ffffff"> &lt;(cool_feature, fixit)</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> * <span style="font-weight: bold; color: #e42e16">beec6f4 </span><span style="color: #19c518"> (</span><span style="color: #e42e16">origin/master</span><span style="color: #19c518">, </span><span style="color: #e42e16">origin/HEAD</span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ Make ReflectorImpl use mailboxes<span style="font-weight: bold"></span><span style="font-weight: bold; color: #ffffff"> &lt;(cool_feature, fixit)</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>
* <span style="font-weight: bold; color: #e42e16">40b838e </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ don't use glibc-specific execinfo.h on uclibc builds * <span style="font-weight: bold; color: #e42e16">41290e0 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ don't use glibc-specific execinfo.h on uclibc builds
* <span style="font-weight: bold; color: #e42e16">65db351 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ [fsp] Add requestUnmount() method together with the request manager. * <span style="font-weight: bold; color: #e42e16">a76fde7 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ [fsp] Add requestUnmount() method together with the request manager.
* <span style="font-weight: bold; color: #e42e16">c1923e0 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ linux_aura: Use system configuration for middle clicking the titlebar. * <span style="font-weight: bold; color: #e42e16">9de7a71 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ linux_aura: Use system configuration for middle clicking the titlebar.
* <span style="font-weight: bold; color: #e42e16">ccaca03 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ ContentView-&gt;ContentViewCore in ContentViewRenderView * <span style="font-weight: bold; color: #e42e16">073b0c2 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ ContentView-&gt;ContentViewCore in ContentViewRenderView
* <span style="font-weight: bold; color: #e42e16">9b1c1ab </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ ozone: evdev: Filter devices by path * <span style="font-weight: bold; color: #e42e16">2250f53 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ ozone: evdev: Filter devices by path
* <span style="font-weight: bold; color: #e42e16">a91bbf9 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Always output seccomp error messages to stderr * <span style="font-weight: bold; color: #e42e16">33a7a74 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Always output seccomp error messages to stderr
</code></pre></div></div><p><div class="paragraph"></p></div> </code></pre></div></div><p><div class="paragraph"></p></div>
<div class="paragraph"><p>As you can see, the structure of the commit history is visible, particularly <div class="paragraph"><p>As you can see, the structure of the commit history is visible, particularly
what the parents of each commit are. In order to see the <em>upstream</em> what the parents of each commit are. In order to see the <em>upstream</em>

2
docs/html/git-nav-downstream.html
Unescape Escape View File

@ -783,7 +783,7 @@ Please select a downstream branch
0. cool_feature 0. cool_feature
1. fixit 1. fixit
Selection (0-1)[0]: 0 Selection (0-1)[0]: 0
Previous HEAD position was 619ccc9... Make ReflectorImpl use mailboxes Previous HEAD position was beec6f4... Make ReflectorImpl use mailboxes
Switched to branch 'cool_feature' Switched to branch 'cool_feature'
Your branch is ahead of 'origin/master' by 4 commits. Your branch is ahead of 'origin/master' by 4 commits.
(use "git push" to publish your local commits) (use "git push" to publish your local commits)

2
docs/html/git-nav-upstream.html
Unescape Escape View File

@ -798,7 +798,7 @@ do so (now or later) by using -b with the checkout command again. Example:
git checkout -b new_branch_name git checkout -b new_branch_name
HEAD is now at 619ccc9... Make ReflectorImpl use mailboxes HEAD is now at beec6f4... Make ReflectorImpl use mailboxes
<span style="font-weight: bold; color: #ffffff">$ git map-branches</span> <span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
<span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">origin/master * <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">origin/master *
</span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518"> cool_feature </span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518"> cool_feature

1
docs/html/git-new-branch.html
Unescape Escape View File

@ -854,6 +854,7 @@ defaults to <em>origin/master</em>. This is considered to be the <em>root</em>
</span><span style="color: #19c518"></span><span style="color: #19c518"> frozen_branch </span><span style="color: #19c518"></span><span style="color: #19c518"> frozen_branch
</span><span style="color: #19c518"></span><span style="color: #19c518"> independent_cl </span><span style="color: #19c518"></span><span style="color: #19c518"> independent_cl
</span><span style="font-weight: bold; color: #ffffff">$ git checkout cool_feature</span> </span><span style="font-weight: bold; color: #ffffff">$ git checkout cool_feature</span>
Switched to branch 'cool_feature'
Your branch is ahead of 'origin/master' by 4 commits. Your branch is ahead of 'origin/master' by 4 commits.
(use "git push" to publish your local commits) (use "git push" to publish your local commits)
<span style="font-weight: bold; color: #ffffff">$ git new-branch --upstream_current cl_depends_on_cool_feature</span> <span style="font-weight: bold; color: #ffffff">$ git new-branch --upstream_current cl_depends_on_cool_feature</span>

68
docs/html/git-squash-branch.html
Unescape Escape View File

@ -801,46 +801,46 @@ verify that the conflict diff is what you expected (and then skip it with
<h2 id="_example">EXAMPLE</h2> <h2 id="_example">EXAMPLE</h2>
<div class="sectionbody"> <div class="sectionbody">
<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git map</span> <div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git map</span>
<span style="background-color: #492ee1"></span><span style="font-weight: bold; background-color: #492ee1">* </span><span style="font-weight: bold; color: #e42e16; background-color: #492ee1">a8f0220 </span><span style="color: #19c518"> (</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">frozen_branch</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ FREEZE.unindexed <span style="background-color: #492ee1"></span><span style="font-weight: bold; background-color: #492ee1">* </span><span style="font-weight: bold; color: #e42e16; background-color: #492ee1">d0fb9c7 </span><span style="color: #19c518"> (</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">frozen_branch</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ FREEZE.unindexed
* <span style="font-weight: bold; color: #e42e16">c382556 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ modfile * <span style="font-weight: bold; color: #e42e16">f48f415 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ modfile
* <span style="font-weight: bold; color: #e42e16">06e399f </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ a deleted file * <span style="font-weight: bold; color: #e42e16">4c5b9c0 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ a deleted file
* <span style="font-weight: bold; color: #e42e16">20494d2 </span><span style="color: #19c518"> (</span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">fixit</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ Add neat feature<span style="font-weight: bold"></span><span style="font-weight: bold; color: #ffffff"> &lt;(frozen_branch)</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> * <span style="font-weight: bold; color: #e42e16">f7ce1e4 </span><span style="color: #19c518"> (</span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">fixit</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ Add neat feature<span style="font-weight: bold"></span><span style="font-weight: bold; color: #ffffff"> &lt;(frozen_branch)</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>
* <span style="font-weight: bold; color: #e42e16">f734bbf </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Epic README update * <span style="font-weight: bold; color: #e42e16">3726937 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Epic README update
<span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #e42e16">983a7b8 </span><span style="color: #19c518"> (</span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">cool_feature</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ Respond to CL comments <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #e42e16">14db2e5 </span><span style="color: #19c518"> (</span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">cool_feature</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ Respond to CL comments
<span style="color: #e42e16">|</span> <span style="color: #19c518">|</span> * <span style="font-weight: bold; color: #e42e16">2f53c1f </span><span style="color: #19c518"> (</span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">subfeature</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ integrate with CoolService <span style="color: #e42e16">|</span> <span style="color: #19c518">|</span> * <span style="font-weight: bold; color: #e42e16">ee3f972 </span><span style="color: #19c518"> (</span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">subfeature</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ integrate with CoolService
<span style="color: #e42e16">|</span> <span style="color: #19c518">|</span> * <span style="font-weight: bold; color: #e42e16">b4e5087 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ slick commenting action <span style="color: #e42e16">|</span> <span style="color: #19c518">|</span> * <span style="font-weight: bold; color: #e42e16">4f9f508 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ slick commenting action
<span style="color: #e42e16">|</span> <span style="color: #19c518">|</span><span style="color: #19c518">/</span> <span style="color: #e42e16">|</span> <span style="color: #19c518">|</span><span style="color: #19c518">/</span>
<span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #e42e16">ac10591 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ another improvement<span style="font-weight: bold"></span><span style="font-weight: bold; color: #ffffff"> &lt;(subfeature)</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #e42e16">7d84f85 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ another improvement<span style="font-weight: bold"></span><span style="font-weight: bold; color: #ffffff"> &lt;(subfeature)</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>
<span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #e42e16">088691d </span><span style="color: #19c518"> (</span><span style="color: #d338d3"></span><span style="font-weight: bold; color: #d338d3">spleen_tag</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ Refactor spleen <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #e42e16">27abea4 </span><span style="color: #19c518"> (</span><span style="color: #d338d3"></span><span style="font-weight: bold; color: #d338d3">spleen_tag</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ Refactor spleen
<span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #e42e16">206ceb2 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Add widget <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #e42e16">d8abe73 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Add widget
<span style="color: #e42e16">|</span><span style="color: #e42e16">/</span> <span style="color: #e42e16">|</span><span style="color: #e42e16">/</span>
* <span style="font-weight: bold; color: #e42e16">619ccc9 </span><span style="color: #19c518"> (</span><span style="color: #e42e16">origin/master</span><span style="color: #19c518">, </span><span style="color: #e42e16">origin/HEAD</span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ Make ReflectorImpl use mailboxes<span style="font-weight: bold"></span><span style="font-weight: bold; color: #ffffff"> &lt;(cool_feature, fixit)</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> * <span style="font-weight: bold; color: #e42e16">beec6f4 </span><span style="color: #19c518"> (</span><span style="color: #e42e16">origin/master</span><span style="color: #19c518">, </span><span style="color: #e42e16">origin/HEAD</span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ Make ReflectorImpl use mailboxes<span style="font-weight: bold"></span><span style="font-weight: bold; color: #ffffff"> &lt;(cool_feature, fixit)</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>
* <span style="font-weight: bold; color: #e42e16">40b838e </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ don't use glibc-specific execinfo.h on uclibc builds * <span style="font-weight: bold; color: #e42e16">41290e0 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ don't use glibc-specific execinfo.h on uclibc builds
* <span style="font-weight: bold; color: #e42e16">65db351 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ [fsp] Add requestUnmount() method together with the request manager. * <span style="font-weight: bold; color: #e42e16">a76fde7 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ [fsp] Add requestUnmount() method together with the request manager.
* <span style="font-weight: bold; color: #e42e16">c1923e0 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ linux_aura: Use system configuration for middle clicking the titlebar. * <span style="font-weight: bold; color: #e42e16">9de7a71 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ linux_aura: Use system configuration for middle clicking the titlebar.
* <span style="font-weight: bold; color: #e42e16">ccaca03 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ ContentView-&gt;ContentViewCore in ContentViewRenderView * <span style="font-weight: bold; color: #e42e16">073b0c2 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ ContentView-&gt;ContentViewCore in ContentViewRenderView
* <span style="font-weight: bold; color: #e42e16">9b1c1ab </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ ozone: evdev: Filter devices by path * <span style="font-weight: bold; color: #e42e16">2250f53 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ ozone: evdev: Filter devices by path
* <span style="font-weight: bold; color: #e42e16">a91bbf9 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Always output seccomp error messages to stderr * <span style="font-weight: bold; color: #e42e16">33a7a74 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Always output seccomp error messages to stderr
<span style="font-weight: bold; color: #ffffff">$ git squash-branch -m 'cool squash demo'</span> <span style="font-weight: bold; color: #ffffff">$ git squash-branch -m 'cool squash demo'</span>
<span style="font-weight: bold; color: #ffffff">$ git map</span> <span style="font-weight: bold; color: #ffffff">$ git map</span>
<span style="background-color: #492ee1"></span><span style="font-weight: bold; background-color: #492ee1">* </span><span style="font-weight: bold; color: #e42e16; background-color: #492ee1">5b451bd </span><span style="color: #19c518"> (</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">frozen_branch</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ cool squash demo <span style="background-color: #492ee1"></span><span style="font-weight: bold; background-color: #492ee1">* </span><span style="font-weight: bold; color: #e42e16; background-color: #492ee1">98e69e8 </span><span style="color: #19c518"> (</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">frozen_branch</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ cool squash demo
* <span style="font-weight: bold; color: #e42e16">20494d2 </span><span style="color: #19c518"> (</span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">fixit</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ Add neat feature<span style="font-weight: bold"></span><span style="font-weight: bold; color: #ffffff"> &lt;(frozen_branch)</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> * <span style="font-weight: bold; color: #e42e16">f7ce1e4 </span><span style="color: #19c518"> (</span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">fixit</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ Add neat feature<span style="font-weight: bold"></span><span style="font-weight: bold; color: #ffffff"> &lt;(frozen_branch)</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>
* <span style="font-weight: bold; color: #e42e16">f734bbf </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Epic README update * <span style="font-weight: bold; color: #e42e16">3726937 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Epic README update
<span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #e42e16">983a7b8 </span><span style="color: #19c518"> (</span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">cool_feature</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ Respond to CL comments <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #e42e16">14db2e5 </span><span style="color: #19c518"> (</span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">cool_feature</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ Respond to CL comments
<span style="color: #e42e16">|</span> <span style="color: #19c518">|</span> * <span style="font-weight: bold; color: #e42e16">2f53c1f </span><span style="color: #19c518"> (</span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">subfeature</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ integrate with CoolService <span style="color: #e42e16">|</span> <span style="color: #19c518">|</span> * <span style="font-weight: bold; color: #e42e16">ee3f972 </span><span style="color: #19c518"> (</span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">subfeature</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ integrate with CoolService
<span style="color: #e42e16">|</span> <span style="color: #19c518">|</span> * <span style="font-weight: bold; color: #e42e16">b4e5087 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ slick commenting action <span style="color: #e42e16">|</span> <span style="color: #19c518">|</span> * <span style="font-weight: bold; color: #e42e16">4f9f508 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ slick commenting action
<span style="color: #e42e16">|</span> <span style="color: #19c518">|</span><span style="color: #19c518">/</span> <span style="color: #e42e16">|</span> <span style="color: #19c518">|</span><span style="color: #19c518">/</span>
<span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #e42e16">ac10591 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ another improvement<span style="font-weight: bold"></span><span style="font-weight: bold; color: #ffffff"> &lt;(subfeature)</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #e42e16">7d84f85 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ another improvement<span style="font-weight: bold"></span><span style="font-weight: bold; color: #ffffff"> &lt;(subfeature)</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>
<span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #e42e16">088691d </span><span style="color: #19c518"> (</span><span style="color: #d338d3"></span><span style="font-weight: bold; color: #d338d3">spleen_tag</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ Refactor spleen <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #e42e16">27abea4 </span><span style="color: #19c518"> (</span><span style="color: #d338d3"></span><span style="font-weight: bold; color: #d338d3">spleen_tag</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ Refactor spleen
<span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #e42e16">206ceb2 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Add widget <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #e42e16">d8abe73 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Add widget
<span style="color: #e42e16">|</span><span style="color: #e42e16">/</span> <span style="color: #e42e16">|</span><span style="color: #e42e16">/</span>
* <span style="font-weight: bold; color: #e42e16">619ccc9 </span><span style="color: #19c518"> (</span><span style="color: #e42e16">origin/master</span><span style="color: #19c518">, </span><span style="color: #e42e16">origin/HEAD</span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ Make ReflectorImpl use mailboxes<span style="font-weight: bold"></span><span style="font-weight: bold; color: #ffffff"> &lt;(cool_feature, fixit)</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> * <span style="font-weight: bold; color: #e42e16">beec6f4 </span><span style="color: #19c518"> (</span><span style="color: #e42e16">origin/master</span><span style="color: #19c518">, </span><span style="color: #e42e16">origin/HEAD</span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ Make ReflectorImpl use mailboxes<span style="font-weight: bold"></span><span style="font-weight: bold; color: #ffffff"> &lt;(cool_feature, fixit)</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>
* <span style="font-weight: bold; color: #e42e16">40b838e </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ don't use glibc-specific execinfo.h on uclibc builds * <span style="font-weight: bold; color: #e42e16">41290e0 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ don't use glibc-specific execinfo.h on uclibc builds
* <span style="font-weight: bold; color: #e42e16">65db351 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ [fsp] Add requestUnmount() method together with the request manager. * <span style="font-weight: bold; color: #e42e16">a76fde7 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ [fsp] Add requestUnmount() method together with the request manager.
* <span style="font-weight: bold; color: #e42e16">c1923e0 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ linux_aura: Use system configuration for middle clicking the titlebar. * <span style="font-weight: bold; color: #e42e16">9de7a71 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ linux_aura: Use system configuration for middle clicking the titlebar.
* <span style="font-weight: bold; color: #e42e16">ccaca03 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ ContentView-&gt;ContentViewCore in ContentViewRenderView * <span style="font-weight: bold; color: #e42e16">073b0c2 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ ContentView-&gt;ContentViewCore in ContentViewRenderView
* <span style="font-weight: bold; color: #e42e16">9b1c1ab </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ ozone: evdev: Filter devices by path * <span style="font-weight: bold; color: #e42e16">2250f53 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ ozone: evdev: Filter devices by path
* <span style="font-weight: bold; color: #e42e16">a91bbf9 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Always output seccomp error messages to stderr * <span style="font-weight: bold; color: #e42e16">33a7a74 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Always output seccomp error messages to stderr
</code></pre></div></div><p><div class="paragraph"></p></div> </code></pre></div></div><p><div class="paragraph"></p></div>
</div> </div>
</div> </div>

4
docs/man1/git-freeze.1
Unescape Escape View File

@ -58,7 +58,7 @@ D deleted_file
\fB$ git freeze\fR \fB$ git freeze\fR
\fB$ git status \-\-short\fR \fB$ git status \-\-short\fR
\fB$ git log \-n 2 \-\-stat\fR \fB$ git log \-n 2 \-\-stat\fR
commit bed4472f2ad34bebabd7cf79f3155ebc6d86707d commit 85b90eda860a6f62d95efdb29a09ebe2bace018d
Author: local <local@chromium\&.org> Author: local <local@chromium\&.org>
Date: Thu Apr 10 08:54:56 2014 +0000 Date: Thu Apr 10 08:54:56 2014 +0000
@ -70,7 +70,7 @@ Date: Thu Apr 10 08:54:56 2014 +0000
unstaged_deleted_file | 1 \- unstaged_deleted_file | 1 \-
4 files changed, 2 insertions(+), 1 deletion(\-) 4 files changed, 2 insertions(+), 1 deletion(\-)
commit cde1eb5500ede60053ae47b3fb1231e9e62be793 commit 4d4db1b3bfbb42b0c9c87326bd522cc9d6946911
Author: local <local@chromium\&.org> Author: local <local@chromium\&.org>
Date: Thu Apr 10 08:54:56 2014 +0000 Date: Thu Apr 10 08:54:56 2014 +0000

36
docs/man1/git-map.1
Unescape Escape View File

@ -138,26 +138,26 @@ Running \fIgit map\fR would result in an output something like:
.\} .\}
.nf .nf
\fB$ git map\fR \fB$ git map\fR
\fB* a8f0220 \fR (\fBfrozen_branch\fR) 2014\-04\-10 ~ FREEZE\&.unindexed \fB* d0fb9c7 \fR (\fBfrozen_branch\fR) 2014\-04\-10 ~ FREEZE\&.unindexed
* \fBc382556 \fR 2014\-04\-10 ~ modfile * \fBf48f415 \fR 2014\-04\-10 ~ modfile
* \fB06e399f \fR 2014\-04\-10 ~ a deleted file * \fB4c5b9c0 \fR 2014\-04\-10 ~ a deleted file
* \fB20494d2 \fR (\fBfixit\fR) 2014\-04\-10 ~ Add neat feature\fB <(frozen_branch)\fR * \fBf7ce1e4 \fR (\fBfixit\fR) 2014\-04\-10 ~ Add neat feature\fB <(frozen_branch)\fR
* \fBf734bbf \fR 2014\-04\-10 ~ Epic README update * \fB3726937 \fR 2014\-04\-10 ~ Epic README update
| * \fB983a7b8 \fR (\fBcool_feature\fR) 2014\-04\-10 ~ Respond to CL comments | * \fB14db2e5 \fR (\fBcool_feature\fR) 2014\-04\-10 ~ Respond to CL comments
| | * \fB2f53c1f \fR (\fBsubfeature\fR) 2014\-04\-10 ~ integrate with CoolService | | * \fBee3f972 \fR (\fBsubfeature\fR) 2014\-04\-10 ~ integrate with CoolService
| | * \fBb4e5087 \fR 2014\-04\-10 ~ slick commenting action | | * \fB4f9f508 \fR 2014\-04\-10 ~ slick commenting action
| |/ | |/
| * \fBac10591 \fR 2014\-04\-10 ~ another improvement\fB <(subfeature)\fR | * \fB7d84f85 \fR 2014\-04\-10 ~ another improvement\fB <(subfeature)\fR
| * \fB088691d \fR (\fBspleen_tag\fR) 2014\-04\-10 ~ Refactor spleen | * \fB27abea4 \fR (\fBspleen_tag\fR) 2014\-04\-10 ~ Refactor spleen
| * \fB206ceb2 \fR 2014\-04\-10 ~ Add widget | * \fBd8abe73 \fR 2014\-04\-10 ~ Add widget
|/ |/
* \fB619ccc9 \fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Make ReflectorImpl use mailboxes\fB <(cool_feature, fixit)\fR * \fBbeec6f4 \fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Make ReflectorImpl use mailboxes\fB <(cool_feature, fixit)\fR
* \fB40b838e \fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds * \fB41290e0 \fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds
* \fB65db351 \fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&. * \fBa76fde7 \fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&.
* \fBc1923e0 \fR 2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&. * \fB9de7a71 \fR 2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&.
* \fBccaca03 \fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewRenderView * \fB073b0c2 \fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewRenderView
* \fB9b1c1ab \fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path * \fB2250f53 \fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path
* \fBa91bbf9 \fR 2014\-04\-10 ~ Always output seccomp error messages to stderr * \fB33a7a74 \fR 2014\-04\-10 ~ Always output seccomp error messages to stderr
.fi .fi
.if n \{\ .if n \{\
.RE .RE

2
docs/man1/git-nav-downstream.1
Unescape Escape View File

@ -57,7 +57,7 @@ Please select a downstream branch
0\&. cool_feature 0\&. cool_feature
1\&. fixit 1\&. fixit
Selection (0\-1)[0]: 0 Selection (0\-1)[0]: 0
Previous HEAD position was 619ccc9\&.\&.\&. Make ReflectorImpl use mailboxes Previous HEAD position was beec6f4\&.\&.\&. Make ReflectorImpl use mailboxes
Switched to branch \*(Aqcool_feature\*(Aq Switched to branch \*(Aqcool_feature\*(Aq
Your branch is ahead of \*(Aqorigin/master\*(Aq by 4 commits\&. Your branch is ahead of \*(Aqorigin/master\*(Aq by 4 commits\&.
(use "git push" to publish your local commits) (use "git push" to publish your local commits)

2
docs/man1/git-nav-upstream.1
Unescape Escape View File

@ -74,7 +74,7 @@ do so (now or later) by using \-b with the checkout command again\&. Example:
git checkout \-b new_branch_name git checkout \-b new_branch_name
HEAD is now at 619ccc9\&.\&.\&. Make ReflectorImpl use mailboxes HEAD is now at beec6f4\&.\&.\&. Make ReflectorImpl use mailboxes
\fB$ git map\-branches\fR \fB$ git map\-branches\fR
\fBorigin/master * \fBorigin/master *
\fR cool_feature \fR cool_feature

1
docs/man1/git-new-branch.1
Unescape Escape View File

@ -101,6 +101,7 @@ origin/master
frozen_branch frozen_branch
independent_cl independent_cl
\fB$ git checkout cool_feature\fR \fB$ git checkout cool_feature\fR
Switched to branch \*(Aqcool_feature\*(Aq
Your branch is ahead of \*(Aqorigin/master\*(Aq by 4 commits\&. Your branch is ahead of \*(Aqorigin/master\*(Aq by 4 commits\&.
(use "git push" to publish your local commits) (use "git push" to publish your local commits)
\fB$ git new\-branch \-\-upstream_current cl_depends_on_cool_feature\fR \fB$ git new\-branch \-\-upstream_current cl_depends_on_cool_feature\fR

68
docs/man1/git-squash-branch.1
Unescape Escape View File

@ -55,46 +55,46 @@ Optional message to use for the first line of the squashed commit\&. If omitted,
.\} .\}
.nf .nf
\fB$ git map\fR \fB$ git map\fR
\fB* a8f0220 \fR (\fBfrozen_branch\fR) 2014\-04\-10 ~ FREEZE\&.unindexed \fB* d0fb9c7 \fR (\fBfrozen_branch\fR) 2014\-04\-10 ~ FREEZE\&.unindexed
* \fBc382556 \fR 2014\-04\-10 ~ modfile * \fBf48f415 \fR 2014\-04\-10 ~ modfile
* \fB06e399f \fR 2014\-04\-10 ~ a deleted file * \fB4c5b9c0 \fR 2014\-04\-10 ~ a deleted file
* \fB20494d2 \fR (\fBfixit\fR) 2014\-04\-10 ~ Add neat feature\fB <(frozen_branch)\fR * \fBf7ce1e4 \fR (\fBfixit\fR) 2014\-04\-10 ~ Add neat feature\fB <(frozen_branch)\fR
* \fBf734bbf \fR 2014\-04\-10 ~ Epic README update * \fB3726937 \fR 2014\-04\-10 ~ Epic README update
| * \fB983a7b8 \fR (\fBcool_feature\fR) 2014\-04\-10 ~ Respond to CL comments | * \fB14db2e5 \fR (\fBcool_feature\fR) 2014\-04\-10 ~ Respond to CL comments
| | * \fB2f53c1f \fR (\fBsubfeature\fR) 2014\-04\-10 ~ integrate with CoolService | | * \fBee3f972 \fR (\fBsubfeature\fR) 2014\-04\-10 ~ integrate with CoolService
| | * \fBb4e5087 \fR 2014\-04\-10 ~ slick commenting action | | * \fB4f9f508 \fR 2014\-04\-10 ~ slick commenting action
| |/ | |/
| * \fBac10591 \fR 2014\-04\-10 ~ another improvement\fB <(subfeature)\fR | * \fB7d84f85 \fR 2014\-04\-10 ~ another improvement\fB <(subfeature)\fR
| * \fB088691d \fR (\fBspleen_tag\fR) 2014\-04\-10 ~ Refactor spleen | * \fB27abea4 \fR (\fBspleen_tag\fR) 2014\-04\-10 ~ Refactor spleen
| * \fB206ceb2 \fR 2014\-04\-10 ~ Add widget | * \fBd8abe73 \fR 2014\-04\-10 ~ Add widget
|/ |/
* \fB619ccc9 \fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Make ReflectorImpl use mailboxes\fB <(cool_feature, fixit)\fR * \fBbeec6f4 \fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Make ReflectorImpl use mailboxes\fB <(cool_feature, fixit)\fR
* \fB40b838e \fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds * \fB41290e0 \fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds
* \fB65db351 \fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&. * \fBa76fde7 \fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&.
* \fBc1923e0 \fR 2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&. * \fB9de7a71 \fR 2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&.
* \fBccaca03 \fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewRenderView * \fB073b0c2 \fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewRenderView
* \fB9b1c1ab \fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path * \fB2250f53 \fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path
* \fBa91bbf9 \fR 2014\-04\-10 ~ Always output seccomp error messages to stderr * \fB33a7a74 \fR 2014\-04\-10 ~ Always output seccomp error messages to stderr
\fB$ git squash\-branch \-m \*(Aqcool squash demo\*(Aq\fR \fB$ git squash\-branch \-m \*(Aqcool squash demo\*(Aq\fR
\fB$ git map\fR \fB$ git map\fR
\fB* 5b451bd \fR (\fBfrozen_branch\fR) 2014\-04\-10 ~ cool squash demo \fB* 98e69e8 \fR (\fBfrozen_branch\fR) 2014\-04\-10 ~ cool squash demo
* \fB20494d2 \fR (\fBfixit\fR) 2014\-04\-10 ~ Add neat feature\fB <(frozen_branch)\fR * \fBf7ce1e4 \fR (\fBfixit\fR) 2014\-04\-10 ~ Add neat feature\fB <(frozen_branch)\fR
* \fBf734bbf \fR 2014\-04\-10 ~ Epic README update * \fB3726937 \fR 2014\-04\-10 ~ Epic README update
| * \fB983a7b8 \fR (\fBcool_feature\fR) 2014\-04\-10 ~ Respond to CL comments | * \fB14db2e5 \fR (\fBcool_feature\fR) 2014\-04\-10 ~ Respond to CL comments
| | * \fB2f53c1f \fR (\fBsubfeature\fR) 2014\-04\-10 ~ integrate with CoolService | | * \fBee3f972 \fR (\fBsubfeature\fR) 2014\-04\-10 ~ integrate with CoolService
| | * \fBb4e5087 \fR 2014\-04\-10 ~ slick commenting action | | * \fB4f9f508 \fR 2014\-04\-10 ~ slick commenting action
| |/ | |/
| * \fBac10591 \fR 2014\-04\-10 ~ another improvement\fB <(subfeature)\fR | * \fB7d84f85 \fR 2014\-04\-10 ~ another improvement\fB <(subfeature)\fR
| * \fB088691d \fR (\fBspleen_tag\fR) 2014\-04\-10 ~ Refactor spleen | * \fB27abea4 \fR (\fBspleen_tag\fR) 2014\-04\-10 ~ Refactor spleen
| * \fB206ceb2 \fR 2014\-04\-10 ~ Add widget | * \fBd8abe73 \fR 2014\-04\-10 ~ Add widget
|/ |/
* \fB619ccc9 \fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Make ReflectorImpl use mailboxes\fB <(cool_feature, fixit)\fR * \fBbeec6f4 \fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Make ReflectorImpl use mailboxes\fB <(cool_feature, fixit)\fR
* \fB40b838e \fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds * \fB41290e0 \fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds
* \fB65db351 \fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&. * \fBa76fde7 \fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&.
* \fBc1923e0 \fR 2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&. * \fB9de7a71 \fR 2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&.
* \fBccaca03 \fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewRenderView * \fB073b0c2 \fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewRenderView
* \fB9b1c1ab \fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path * \fB2250f53 \fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path
* \fBa91bbf9 \fR 2014\-04\-10 ~ Always output seccomp error messages to stderr * \fB33a7a74 \fR 2014\-04\-10 ~ Always output seccomp error messages to stderr
.fi .fi
.if n \{\ .if n \{\
.RE .RE

30
docs/man7/depot_tools_tutorial.7
Unescape Escape View File

@ -376,10 +376,10 @@ It was a Domo\-Kuun\&.
* \fB2250f53 \fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path * \fB2250f53 \fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path
* \fB33a7a74 \fR 2014\-04\-10 ~ Always output seccomp error messages to stderr * \fB33a7a74 \fR 2014\-04\-10 ~ Always output seccomp error messages to stderr
\fB$ git status\fR \fB$ git status\fR
On branch fix_typo # On branch fix_typo
Your branch is ahead of \*(Aqorigin/master\*(Aq by 1 commit\&. # Your branch is ahead of \*(Aqorigin/master\*(Aq by 1 commit\&.
(use "git push" to publish your local commits) # (use "git push" to publish your local commits)
#
nothing to commit, working directory clean nothing to commit, working directory clean
\fB$ git cl upload \-r domo@chromium\&.org \-\-send\-mail\fR \fB$ git cl upload \-r domo@chromium\&.org \-\-send\-mail\fR
\&.\&.\&. truncated output \&.\&.\&. \&.\&.\&. truncated output \&.\&.\&.
@ -406,15 +406,15 @@ overhead, barely disturbing the thick cigarette smoke\&. No doubt was left about
when the fan was last cleaned\&. when the fan was last cleaned\&.
EOF EOF
\fB$ git status\fR \fB$ git status\fR
On branch chap2 # On branch chap2
Your branch is up\-to\-date with \*(Aqorigin/master\*(Aq\&. # Your branch is up\-to\-date with \*(Aqorigin/master\*(Aq\&.
#
Changes not staged for commit: # Changes not staged for commit:
(use "git add <file>\&.\&.\&." to update what will be committed) # (use "git add <file>\&.\&.\&." to update what will be committed)
(use "git checkout \-\- <file>\&.\&.\&." to discard changes in working directory) # (use "git checkout \-\- <file>\&.\&.\&." to discard changes in working directory)
#
modified: build/whitespace_file\&.txt # modified: build/whitespace_file\&.txt
#
no changes added to commit (use "git add" and/or "git commit \-a") no changes added to commit (use "git add" and/or "git commit \-a")
.fi .fi
.if n \{\ .if n \{\
@ -640,7 +640,7 @@ We haven\*(Aqt updated the code in a while, so let\*(Aqs do that now\&.
.nf .nf
\fB$ git rebase\-update\fR \fB$ git rebase\-update\fR
Fetching origin Fetching origin
From /Users/iannucci/chromium/depot_tools/docs/src/demo_repo From https://upstream
beec6f4\&.\&.59cdb73 master \-> origin/master beec6f4\&.\&.59cdb73 master \-> origin/master
Rebasing: chap2 Rebasing: chap2
Rebasing: fix_typo Rebasing: fix_typo
@ -690,7 +690,7 @@ Someone on IRC mentions that they actually landed a chapter 3 already! We should
.nf .nf
\fB$ git rebase\-update\fR \fB$ git rebase\-update\fR
Fetching origin Fetching origin
From /Users/iannucci/chromium/depot_tools/docs/src/demo_repo From https://upstream
5d26fec\&.\&.59cdb73 master \-> origin/master 5d26fec\&.\&.59cdb73 master \-> origin/master
Rebasing: chap2 Rebasing: chap2
\&.\&.\&. lots of output, it\*(Aqs a conflict alright :(\&.\&.\&. \&.\&.\&. lots of output, it\*(Aqs a conflict alright :(\&.\&.\&.

2
docs/src/common_demo_functions.sh
Unescape Escape View File

@ -47,7 +47,7 @@ run() {
} }
comment() { comment() {
echo "# $@" echo "###COMMENT### $@"
} }
# run a silent command # run a silent command

6
docs/src/depot_tools_tutorial.demo.tldr.sh
Unescape Escape View File

@ -23,7 +23,7 @@ ed_ws() {
echo -ne "\x1B[37;1m$ echo -e " echo -ne "\x1B[37;1m$ echo -e "
echo -n "'$1'" echo -n "'$1'"
echo -e " | ed $WS\x1B[m" echo -e " | ed $WS\x1B[m"
echo -e "$1" | ed $WS echo -e "$1" | ed $WS 2>&1
} }
# needs an extra echo afterwards # needs an extra echo afterwards
@ -117,7 +117,7 @@ map
comment "We haven't updated the code in a while, so let's do that now." comment "We haven't updated the code in a while, so let's do that now."
pcommand git rebase-update pcommand git rebase-update
echo Fetching origin echo Fetching origin
git fetch origin 2>&1 | grep -v 'stage' git fetch origin 2>&1 | grep -v 'stage' | sed 's+From.*+From https://upstream+'
silent git update-ref refs/remotes/origin/master stage_2 silent git update-ref refs/remotes/origin/master stage_2
silent git tag -d $(git tag -l 'stage_*') silent git tag -d $(git tag -l 'stage_*')
git rebase-update --no_fetch git rebase-update --no_fetch
@ -132,7 +132,7 @@ comment "We should pull their changes before continuing. Brace for"
comment "a code conflict!" comment "a code conflict!"
pcommand git rebase-update pcommand git rebase-update
echo Fetching origin echo Fetching origin
git fetch origin 2>&1 | grep -v 'stage' git fetch origin 2>&1 | grep -v 'stage' | sed 's+From.*+From https://upstream+'
silent git tag -d $(git tag -l 'stage_*') silent git tag -d $(git tag -l 'stage_*')
echo Rebasing: chap2 echo Rebasing: chap2
silent git rebase-update silent git rebase-update

10
docs/src/filter_demo_output.py
Unescape Escape View File

@ -77,6 +77,8 @@ def main():
w = sys.stdout.write w = sys.stdout.write
comment_marker = '###COMMENT###'
callout_counter = 1 callout_counter = 1
if backend == 'xhtml11': if backend == 'xhtml11':
preamble = ( preamble = (
@ -88,11 +90,11 @@ def main():
in_code = False in_code = False
body = c.convert(output, full=False) body = c.convert(output, full=False)
for i, line in enumerate(body.splitlines()): for i, line in enumerate(body.splitlines()):
if line.startswith('# '): if line.startswith(comment_marker):
if in_code: if in_code:
w(postamble) w(postamble)
in_code = False in_code = False
w(line[1:]) w(line[len(comment_marker):])
else: else:
if not in_code: if not in_code:
w(preamble) w(preamble)
@ -115,11 +117,11 @@ def main():
in_code = False in_code = False
body = simpleXML(output) body = simpleXML(output)
for i, line in enumerate(body.splitlines()): for i, line in enumerate(body.splitlines()):
if line.startswith('# '): if line.startswith(comment_marker):
if in_code: if in_code:
w(postamble) w(postamble)
in_code = False in_code = False
w(line[1:]) w(line[len(comment_marker):])
else: else:
if not in_code: if not in_code:
w(preamble) w(preamble)

2
docs/src/git-freeze.demo.1.sh
Unescape Escape View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
. demo_repo.sh . demo_repo.sh
add deleted_file add deleted_file

2
docs/src/git-map-branches.demo.1.sh
Unescape Escape View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
. demo_repo.sh . demo_repo.sh
silent git branch no_upstream HEAD~ silent git branch no_upstream HEAD~

2
docs/src/git-map.demo.1.sh
Unescape Escape View File

@ -1,3 +1,3 @@
#!/bin/sh #!/bin/bash
. demo_repo.sh . demo_repo.sh
run git map run git map

2
docs/src/git-nav-downstream.demo.1.sh
Unescape Escape View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
. demo_repo.sh . demo_repo.sh
silent git checkout origin/master silent git checkout origin/master

2
docs/src/git-nav-upstream.demo.1.sh
Unescape Escape View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
. demo_repo.sh . demo_repo.sh
silent git checkout subfeature silent git checkout subfeature

4
docs/src/git-new-branch.demo.1.sh
Unescape Escape View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
. demo_repo.sh . demo_repo.sh
run git map-branches run git map-branches
@ -7,6 +7,6 @@ run git map-branches
run git new-branch --upstream subfeature nested_cl run git new-branch --upstream subfeature nested_cl
callout 3 callout 3
run git map-branches run git map-branches
run git checkout cool_feature run git checkout cool_feature 2>&1
run git new-branch --upstream_current cl_depends_on_cool_feature run git new-branch --upstream_current cl_depends_on_cool_feature
run git map-branches run git map-branches

2
docs/src/git-squash-branch.demo.1.sh
Unescape Escape View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
. demo_repo.sh . demo_repo.sh
run git map run git map

2
docs/src/make_docs.sh
Unescape Escape View File

@ -41,6 +41,8 @@ then
fi fi
echo Asciidoc up to date at $ASCIIDOC_HASH \($BRANCH\) echo Asciidoc up to date at $ASCIIDOC_HASH \($BRANCH\)
export PATH=`pwd`/asciidoc:$PATH
# We pull ansi2hash to convert demo script output # We pull ansi2hash to convert demo script output
BRANCH=1.0.6 BRANCH=1.0.6
ANSI2HTML_HASH=6282ab7a24a5a7eab2e0b23bb0055234c533a6e9 ANSI2HTML_HASH=6282ab7a24a5a7eab2e0b23bb0055234c533a6e9

Write Preview
Loading…
Cancel
Save