Skip to content

C
Chromium_Depot_tools
Commit 26adc2a9 authored by Josip Sokcevic's avatar Josip Sokcevic Committed by LUCI CQ
Browse files
Options

Fix generating man pages 

Relevant change is in make_docs.sh, all other files were generated.

R=iannucci@chromium.org

Changes:
* upgrade to latest asciidoc, ansi2html and git
* disable interactive git editor (happens during rebase)
* minor tweaks
Change-Id: Ie4b19aa12b8a76826f66e3088c985b99e55164c7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3000882Reviewed-by: 's avatarRobbie Iannucci <iannucci@chromium.org>
Commit-Queue: Josip Sokcevic <sokcevic@google.com>
parent 4362da43
Hide whitespace changes
Inline Side-by-side
Showing with 710 additions and 664 deletions
man/html/depot_tools.html
View file @ 26adc2a9
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
<meta name="generator" content="AsciiDoc 8.6.9" />
<meta name="generator" content="AsciiDoc 9.1.0" />
<title>depot_tools(7)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
......@@ -435,7 +436,7 @@ thead, p.table.header {
p.table {
margin-top: 0;
}
/* Because the table frame attribute is overriden by CSS in most browsers. */
/* Because the table frame attribute is overridden by CSS in most browsers. */
div.tableblock > table[frame="void"] {
border-style: none;
}
......@@ -927,7 +928,8 @@ Print a diff of the current branch, compared to its upstream.
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
Last updated 2020-08-10 17:51:13 CEST
Last updated
2021-07-01 07:07:00 PDT
</div>
</div>
</body>
......
man/html/depot_tools_tutorial.html
View file @ 26adc2a9
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
<meta name="generator" content="AsciiDoc 8.6.9" />
<meta name="generator" content="AsciiDoc 9.1.0" />
<title>depot_tools_tutorial(7)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
......@@ -435,7 +436,7 @@ thead, p.table.header {
p.table {
margin-top: 0;
}
/* Because the table frame attribute is overriden by CSS in most browsers. */
/* Because the table frame attribute is overridden by CSS in most browsers. */
div.tableblock > table[frame="void"] {
border-style: none;
}
......@@ -1105,22 +1106,12 @@ you started on.</p></div>
<td class="icon">
<div class="title">Note</div>
</td>
<td class="content">
<div class="ulist"><ul>
<li>
<p>
Running <code>git rebase-update</code> will update all your branches, but it will not
automatically run <code>gclient sync</code> to update your dependencies.
</p>
</li>
<li>
<p>
Use caution when running <code>git reset</code> on branches managed by <code>depot_tools</code>.
These tools track the set of "commits contained in the branch" from a branch&#8217;s "merge point"
to the current branch value. See <code>git help mark-merge-base</code> for more discussion of the merge base.
</p>
</li>
</ul></div>
<td class="content">Running <code>git rebase-update</code> will update all your branches, but it will not
automatically run <code>gclient sync</code> to update your dependencies. Use caution when
running <code>git reset</code> on branches managed by <em>depot_tools</em>. These tools track the
set of "commits contained in the branch" from a branch&#8217;s "merge point" to the
current branch value. See <code>git help mark-merge-base</code> for more discussion of the
merge base.</td>
</tr></table>
</div>
</div>
......@@ -1258,14 +1249,15 @@ It was a Domo-Kuun.
[fix_typo 615ffa7] Fix terrible typo.
1 file changed, 1 insertion(+), 1 deletion(-)
<span style="font-weight: bold; color: #ffffff">$ git map</span>
* <span style="font-weight: bold; color: #e42e16">615ffa7 </span><span style="color: #19c518"> (</span><span style="color: #e42e16">HEAD -&gt; fix_typo</span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ Fix terrible typo.
* <span style="font-weight: bold; color: #e42e16">beec6f4 </span><span style="color: #19c518"> (</span><span style="color: #e42e16">origin/main</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;(fix_typo)</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>
* <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">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">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">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">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="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">615ffa720f</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">HEAD -&gt; fix_typo</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ Fix terrible typo.
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">beec6f4746</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #e42e16">origin/main</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">, </span><span style="font-weight: bold; color: #e42e16">origin/HEAD</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ Make ReflectorImpl use mailboxes
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">41290e02b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ don't use glibc-specific execinfo.h on uclibc builds
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">a76fde7b7b</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ [fsp] Add requestUnmount() method together with the request manager.
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">9de7a713b3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ linux_aura: Use system configuration for middle clicking the titlebar.
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">073b0c203a</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ ContentView-&gt;ContentViewCore in ContentViewRenderView
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">2250f532d7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ ozone: evdev: Filter devices by path
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">33a7a742b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></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>
On branch fix_typo
Your branch is ahead of 'origin/main' by 1 commit.
......@@ -1292,7 +1284,6 @@ Your branch is up to date with 'origin/main'.
Changes not staged for commit:
(use "git add &lt;file&gt;..." to update what will be committed)
(use "git restore &lt;file&gt;..." to discard changes in working directory)
<span style="color: #e42e16">modified: build/whitespace_file.txt</span>
no changes added to commit (use "git add" and/or "git commit -a")
......@@ -1326,17 +1317,18 @@ It was a Domo-<span style="color: #e42e16">Banana</span><span style="color: #19c
... truncated output ...
</code></pre></div></div><p><div class="paragraph"> Since we got lgtm, let the CQ land it.</p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git cl set_commit</span>
<span style="font-weight: bold; color: #ffffff">$ git map</span>
* <span style="font-weight: bold; color: #e42e16">0e2e52e </span><span style="color: #19c518"> (</span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">chap2</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="color: #e42e16">|</span> * <span style="font-weight: bold; color: #e42e16">2c0ad9c </span><span style="color: #19c518"> (</span><span style="color: #e42e16">HEAD -&gt; fix_typo</span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ Fix typo for good!
<span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #e42e16">615ffa7 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Fix terrible typo.
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">0e2e52e72e</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #19c518"></span><span style="font-weight: bold; color: #19c518">chap2</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ FREEZE.unindexed
<span style="color: #e42e16">|</span> * <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">2c0ad9c59b</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">HEAD -&gt; fix_typo</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ Fix typo for good!
<span style="color: #e42e16">|</span> * <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">615ffa720f</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Fix terrible typo.
<span style="color: #e42e16">|</span><span style="color: #e42e16">/</span>
* <span style="font-weight: bold; color: #e42e16">beec6f4 </span><span style="color: #19c518"> (</span><span style="color: #e42e16">origin/main</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;(chap2, fix_typo)</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>
* <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">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">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">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">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="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">beec6f4746</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #e42e16">origin/main</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">, </span><span style="font-weight: bold; color: #e42e16">origin/HEAD</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ Make ReflectorImpl use mailboxes &lt;(<span style="color: #ffffff"></span><span style="font-weight: bold; color: #ffffff">chap2</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">41290e02b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ don't use glibc-specific execinfo.h on uclibc builds
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">a76fde7b7b</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ [fsp] Add requestUnmount() method together with the request manager.
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">9de7a713b3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ linux_aura: Use system configuration for middle clicking the titlebar.
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">073b0c203a</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ ContentView-&gt;ContentViewCore in ContentViewRenderView
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">2250f532d7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ ozone: evdev: Filter devices by path
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">33a7a742b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Always output seccomp error messages to stderr
</code></pre></div></div><p><div class="paragraph"> Switch back to where we were using the nav* commands (for fun... git checkout would work here too)</p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
<span style="color: #e42e16"></span><span style="color: #e42e16">origin/main
</span><span style="color: #19c518"></span><span style="color: #19c518"> chap2
......@@ -1410,17 +1402,18 @@ EOF
[chap2 ceef712] Finish chapter 2
1 file changed, 6 insertions(+)
<span style="font-weight: bold; color: #ffffff">$ git map</span>
* <span style="font-weight: bold; color: #e42e16">ceef712 </span><span style="color: #19c518"> (</span><span style="color: #e42e16">HEAD -&gt; chap2</span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ Finish chapter 2
<span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #e42e16">2c0ad9c </span><span style="color: #19c518"> (</span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">fix_typo</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> ~ Fix typo for good!
<span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #e42e16">615ffa7 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Fix terrible typo.
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">ceef712d7f</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">HEAD -&gt; chap2</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ Finish chapter 2
<span style="color: #e42e16">|</span> * <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">2c0ad9c59b</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #19c518"></span><span style="font-weight: bold; color: #19c518">fix_typo</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ Fix typo for good!
<span style="color: #e42e16">|</span> * <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">615ffa720f</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Fix terrible typo.
<span style="color: #e42e16">|</span><span style="color: #e42e16">/</span>
* <span style="font-weight: bold; color: #e42e16">beec6f4 </span><span style="color: #19c518"> (</span><span style="color: #e42e16">origin/main</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;(chap2, fix_typo)</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>
* <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">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">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">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">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="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">beec6f4746</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #e42e16">origin/main</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">, </span><span style="font-weight: bold; color: #e42e16">origin/HEAD</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ Make ReflectorImpl use mailboxes &lt;(<span style="color: #ffffff"></span><span style="font-weight: bold; color: #ffffff">fix_typo</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">41290e02b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ don't use glibc-specific execinfo.h on uclibc builds
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">a76fde7b7b</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ [fsp] Add requestUnmount() method together with the request manager.
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">9de7a713b3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ linux_aura: Use system configuration for middle clicking the titlebar.
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">073b0c203a</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ ContentView-&gt;ContentViewCore in ContentViewRenderView
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">2250f532d7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ ozone: evdev: Filter devices by path
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">33a7a742b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Always output seccomp error messages to stderr
<span style="font-weight: bold; color: #ffffff">$ git cl upload -r domo@chromium.org --send-mail</span>
... truncated output ...
</code></pre></div></div><p><div class="paragraph"> We poke a committer until they lgtm :)</p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git cl set_commit</span>
......@@ -1435,22 +1428,23 @@ EOF
[chap3 7d4238a] beginning of chapter 3
1 file changed, 4 insertions(+)
<span style="font-weight: bold; color: #ffffff">$ git map</span>
* <span style="font-weight: bold; color: #e42e16">7d4238a </span><span style="color: #19c518"> (</span><span style="color: #e42e16">HEAD -&gt; chap3</span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ beginning of chapter 3
* <span style="font-weight: bold; color: #e42e16">ceef712 </span><span style="color: #19c518"> (</span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">chap2</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> ~ Finish chapter 2<span style="font-weight: bold"></span><span style="font-weight: bold; color: #ffffff"> &lt;(chap3)</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">2c0ad9c </span><span style="color: #19c518"> (</span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">fix_typo</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> ~ Fix typo for good!
<span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #e42e16">615ffa7 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Fix terrible typo.
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">7d4238a1e2</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">HEAD -&gt; chap3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ beginning of chapter 3
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">ceef712d7f</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #19c518"></span><span style="font-weight: bold; color: #19c518">chap2</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ Finish chapter 2
<span style="color: #e42e16">|</span> * <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">2c0ad9c59b</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #19c518"></span><span style="font-weight: bold; color: #19c518">fix_typo</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ Fix typo for good!
<span style="color: #e42e16">|</span> * <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">615ffa720f</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Fix terrible typo.
<span style="color: #e42e16">|</span><span style="color: #e42e16">/</span>
* <span style="font-weight: bold; color: #e42e16">beec6f4 </span><span style="color: #19c518"> (</span><span style="color: #e42e16">origin/main</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;(chap2, fix_typo)</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>
* <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">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">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">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">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="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">beec6f4746</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #e42e16">origin/main</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">, </span><span style="font-weight: bold; color: #e42e16">origin/HEAD</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ Make ReflectorImpl use mailboxes &lt;(<span style="color: #ffffff"></span><span style="font-weight: bold; color: #ffffff">chap2, fix_typo</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">41290e02b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ don't use glibc-specific execinfo.h on uclibc builds
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">a76fde7b7b</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ [fsp] Add requestUnmount() method together with the request manager.
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">9de7a713b3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ linux_aura: Use system configuration for middle clicking the titlebar.
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">073b0c203a</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ ContentView-&gt;ContentViewCore in ContentViewRenderView
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">2250f532d7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ ozone: evdev: Filter devices by path
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">33a7a742b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></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>
Fetching origin
From https://upstream
beec6f4..59cdb73 main -&gt; origin/main
beec6f4..59cdb73 main -&gt; origin/main
Rebasing: chap2
Rebasing: fix_typo
Failed! Attempting to squash fix_typo ... Success!
......@@ -1458,27 +1452,30 @@ Rebasing: chap3
Reparented chap3 to track origin/main (was tracking chap2)
Deleted branch fix_typo (was 5d26fec).
Deleted branch chap2 (was 5d26fec).
Running `git gc --auto` - Ctrl-C to abort is OK.
</code></pre></div></div><p><div class="paragraph"> Well look at that. The CQ landed our typo and chapter2 branches already and git rebase-update cleaned them up for us.</p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ gclient sync</span>
... truncated output ...
<span style="font-weight: bold; color: #ffffff">$ git map</span>
* <span style="font-weight: bold; color: #e42e16">93fe917 </span><span style="color: #19c518"> (</span><span style="color: #e42e16">HEAD -&gt; chap3</span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ beginning of chapter 3
* <span style="font-weight: bold; color: #e42e16">5d26fec </span><span style="color: #19c518"> (</span><span style="color: #e42e16">origin/main</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> ~ Finish chapter 2<span style="font-weight: bold"></span><span style="font-weight: bold; color: #ffffff"> &lt;(chap3)</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>
* <span style="font-weight: bold; color: #e42e16">df7fefb </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Revert 255617, due to it not tracking use of the link doctor page properly.
* <span style="font-weight: bold; color: #e42e16">4b39cda </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Fix terrible typo.
* <span style="font-weight: bold; color: #e42e16">248c5b6 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Temporarily CHECK(trial) in ChromeRenderProcessObserver::OnSetFieldTrialGroup.
* <span style="font-weight: bold; color: #e42e16">8171df8 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Remove AMD family check for the flapper crypto accelerator.
* <span style="font-weight: bold; color: #e42e16">d6a30d2 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Change the Pica load benchmark to listen for the polymer-ready event
* <span style="font-weight: bold; color: #e42e16">beec6f4 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Make ReflectorImpl use mailboxes
* <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">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">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">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">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="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">93fe917ad1</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">HEAD -&gt; chap3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ beginning of chapter 3
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">5d26fec369</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #e42e16">origin/main</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">, </span><span style="font-weight: bold; color: #e42e16">origin/HEAD</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ Finish chapter 2
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">df7fefbf06</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Revert 255617, due to it not tracking use of the link doctor page properly.
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">4b39cda0ac</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Fix terrible typo.
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">248c5b6fe3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Temporarily CHECK(trial) in ChromeRenderProcessObserver::OnSetFieldTrialGroup.
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">8171df8af9</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Remove AMD family check for the flapper crypto accelerator.
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">d6a30d2e56</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Change the Pica load benchmark to listen for the polymer-ready event
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">beec6f4746</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Make ReflectorImpl use mailboxes
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">41290e02b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ don't use glibc-specific execinfo.h on uclibc builds
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">a76fde7b7b</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ [fsp] Add requestUnmount() method together with the request manager.
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">9de7a713b3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ linux_aura: Use system configuration for middle clicking the titlebar.
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">073b0c203a</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ ContentView-&gt;ContentViewCore in ContentViewRenderView
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">2250f532d7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ ozone: evdev: Filter devices by path
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">33a7a742b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></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>
Fetching origin
From https://upstream
5d26fec..59cdb73 main -&gt; origin/main
5d26fec..59cdb73 main -&gt; origin/main
Rebasing: chap2
... lots of output, it's a conflict alright :(...
<span style="font-weight: bold; color: #ffffff">$ git diff</span>
......@@ -1495,7 +1492,7 @@ Rebasing: chap2
<span style="color: #19c518">++=======</span>
<span style="color: #19c518">+ Mr. Usagi felt that something wasn't right. Shortly after the Domo-Kun left he</span>
<span style="color: #19c518">+ began feeling sick.</span>
<span style="color: #19c518">++&gt;&gt;&gt;&gt;&gt;&gt;&gt; beginning of chapter 3</span>
<span style="color: #19c518">++&gt;&gt;&gt;&gt;&gt;&gt;&gt; 93fe917 (beginning of chapter 3)</span>
</code></pre></div></div><p><div class="paragraph"> Oh, well, that's not too bad. In fact... that's a terrible chapter 3!</p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ $EDITOR build/whitespace_file.txt</span>
... /me deletes bad chapter 3 ...
<span style="font-weight: bold; color: #ffffff">$ git add build/whitespace_file.txt</span>
......@@ -1512,30 +1509,34 @@ Rebasing: chap2
<span style="color: #19c518">+</span><span style="color: #19c518">Mr. Usagi felt that something wasn't right. Shortly after the Domo-Kun left he</span>
<span style="color: #19c518">+</span><span style="color: #19c518">began feeling sick.</span>
</code></pre></div></div><p><div class="paragraph"> Much better</p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git rebase --continue</span>
Applying: beginning of chapter 3
[detached HEAD 1cb4f5b] beginning of chapter 3
1 file changed, 2 insertions(+), 1 deletion(-)
<span style="font-weight: bold; color: #ffffff">$ git rebase-update</span>
Fetching origin
chap3 up-to-date
Running `git gc --auto` - Ctrl-C to abort is OK.
<span style="font-weight: bold; color: #ffffff">$ gclient sync</span>
... truncated output ...
<span style="font-weight: bold; color: #ffffff">$ git map</span>
* <span style="font-weight: bold; color: #e42e16">1cb4f5b </span><span style="color: #19c518"> (</span><span style="color: #e42e16">HEAD -&gt; chap3</span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ beginning of chapter 3
* <span style="font-weight: bold; color: #e42e16">59cdb73 </span><span style="color: #19c518"> (</span><span style="color: #e42e16">origin/main</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> ~ Refactor data interchange format.<span style="font-weight: bold"></span><span style="font-weight: bold; color: #ffffff"> &lt;(chap3)</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>
* <span style="font-weight: bold; color: #e42e16">34676a3 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Ensure FS is exited for all not-in-same-page navigations.
* <span style="font-weight: bold; color: #e42e16">7d4784e </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Add best chapter2 ever!
* <span style="font-weight: bold; color: #e42e16">5d26fec </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Finish chapter 2
* <span style="font-weight: bold; color: #e42e16">df7fefb </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Revert 255617, due to it not tracking use of the link doctor page properly.
* <span style="font-weight: bold; color: #e42e16">4b39cda </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Fix terrible typo.
* <span style="font-weight: bold; color: #e42e16">248c5b6 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Temporarily CHECK(trial) in ChromeRenderProcessObserver::OnSetFieldTrialGroup.
* <span style="font-weight: bold; color: #e42e16">8171df8 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Remove AMD family check for the flapper crypto accelerator.
* <span style="font-weight: bold; color: #e42e16">d6a30d2 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Change the Pica load benchmark to listen for the polymer-ready event
* <span style="font-weight: bold; color: #e42e16">beec6f4 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Make ReflectorImpl use mailboxes
* <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">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">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">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">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="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">1cb4f5b622</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">HEAD -&gt; chap3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ beginning of chapter 3
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">59cdb7335b</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #e42e16">origin/main</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">, </span><span style="font-weight: bold; color: #e42e16">origin/HEAD</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ Refactor data interchange format.
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">34676a3583</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Ensure FS is exited for all not-in-same-page navigations.
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">7d4784e867</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Add best chapter2 ever!
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">5d26fec369</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Finish chapter 2
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">df7fefbf06</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Revert 255617, due to it not tracking use of the link doctor page properly.
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">4b39cda0ac</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Fix terrible typo.
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">248c5b6fe3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Temporarily CHECK(trial) in ChromeRenderProcessObserver::OnSetFieldTrialGroup.
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">8171df8af9</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Remove AMD family check for the flapper crypto accelerator.
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">d6a30d2e56</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Change the Pica load benchmark to listen for the polymer-ready event
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">beec6f4746</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Make ReflectorImpl use mailboxes
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">41290e02b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ don't use glibc-specific execinfo.h on uclibc builds
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">a76fde7b7b</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ [fsp] Add requestUnmount() method together with the request manager.
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">9de7a713b3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ linux_aura: Use system configuration for middle clicking the titlebar.
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">073b0c203a</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ ContentView-&gt;ContentViewCore in ContentViewRenderView
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">2250f532d7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ ozone: evdev: Filter devices by path
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">33a7a742b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Always output seccomp error messages to stderr
<span style="font-weight: bold; color: #ffffff">$ git cl upload</span>
... truncated output ...
</code></pre></div></div><p><div class="paragraph"></p></div>
......@@ -1600,7 +1601,8 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
Last updated 2020-08-10 17:51:13 CEST
Last updated
2021-07-01 07:12:07 PDT
</div>
</div>
</body>
......
man/html/git-cl.html
View file @ 26adc2a9
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
<meta name="generator" content="AsciiDoc 8.6.9" />
<meta name="generator" content="AsciiDoc 9.1.0" />
<title>git-cl(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
......@@ -435,7 +436,7 @@ thead, p.table.header {
p.table {
margin-top: 0;
}
/* Because the table frame attribute is overriden by CSS in most browsers. */
/* Because the table frame attribute is overridden by CSS in most browsers. */
div.tableblock > table[frame="void"] {
border-style: none;
}
......@@ -1026,7 +1027,8 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
Last updated 2020-08-10 17:51:13 CEST
Last updated
2021-07-01 07:07:00 PDT
</div>
</div>
</body>
......
man/html/git-drover.html
View file @ 26adc2a9
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
<meta name="generator" content="AsciiDoc 8.6.9" />
<meta name="generator" content="AsciiDoc 9.1.0" />
<title>git-drover(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
......@@ -435,7 +436,7 @@ thead, p.table.header {
p.table {
margin-top: 0;
}
/* Because the table frame attribute is overriden by CSS in most browsers. */
/* Because the table frame attribute is overridden by CSS in most browsers. */
div.tableblock > table[frame="void"] {
border-style: none;
}
......@@ -858,7 +859,7 @@ at least once to fetch the branches.</p></div>
<h4 id="_merge_example">Merge Example</h4>
<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code># Here's a commit (from some.committer) that we want to 'drover'.
<span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</span>
<span style="color: #e7e71c">commit c980d966aab8516cc651409da4bf21ca8a4a3613</span>
<span style="color: #e7e71c">commit 62472550afc1d8c317c49bdda05a241e1477e438</span>
Author: some.committer &lt;some.committer@chromium.org&gt;
AuthorDate: Thu Apr 10 08:54:46 2014 +0000
Commit: some.committer &lt;some.committer@chromium.org&gt;
......@@ -867,10 +868,10 @@ CommitDate: Thu Apr 10 08:54:46 2014 +0000
This change needs to go to branch 9999
# Now do the 'drover'.
<span style="font-weight: bold; color: #ffffff">$ git drover --branch 9999 --cherry-pick c980d966aab8516cc651409da4bf21ca8a4a3613</span>
<span style="font-weight: bold; color: #ffffff">$ git drover --branch 9999 --cherry-pick 62472550afc1d8c317c49bdda05a241e1477e438</span>
Going to cherry-pick
"""
<span style="color: #e7e71c">commit c980d966aab8516cc651409da4bf21ca8a4a3613</span>
<span style="color: #e7e71c">commit 62472550afc1d8c317c49bdda05a241e1477e438</span>
Author: some.committer &lt;some.committer@chromium.org&gt;
Date: Thu Apr 10 08:54:46 2014 +0000
......@@ -888,7 +889,7 @@ About to land on 9999. Continue (y/n)? y
<h4 id="_merge_with_conflicts_example">Merge with Conflicts Example</h4>
<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code># Here's a commit (from some.committer) that we want to 'drover'.
<span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</span>
<span style="color: #e7e71c">commit 2d78cf765179c7be5e7e6d1e4565a0d3769e9174</span>
<span style="color: #e7e71c">commit 7fd5f30fcbf6010bb579794d3080ea37d050b26d</span>
Author: some.committer &lt;some.committer@chromium.org&gt;
AuthorDate: Thu Apr 10 08:54:46 2014 +0000
Commit: some.committer &lt;some.committer@chromium.org&gt;
......@@ -897,10 +898,10 @@ CommitDate: Thu Apr 10 08:54:46 2014 +0000
This change needs to go to branch 9999
# Now do the 'drover'.
<span style="font-weight: bold; color: #ffffff">$ git drover --branch 9999 --cherry-pick 2d78cf765179c7be5e7e6d1e4565a0d3769e9174</span>
<span style="font-weight: bold; color: #ffffff">$ git drover --branch 9999 --cherry-pick 7fd5f30fcbf6010bb579794d3080ea37d050b26d</span>
Going to cherry-pick
"""
<span style="color: #e7e71c">commit 2d78cf765179c7be5e7e6d1e4565a0d3769e9174</span>
<span style="color: #e7e71c">commit 7fd5f30fcbf6010bb579794d3080ea37d050b26d</span>
Author: some.committer &lt;some.committer@chromium.org&gt;
Date: Thu Apr 10 08:54:46 2014 +0000
......@@ -942,24 +943,24 @@ Branch 'drover_9999' set up to track remote ref 'refs/branch-heads/9999'.
# Here's the commit we want to revert.
<span style="font-weight: bold; color: #ffffff">$ git log -n 1</span>
<span style="color: #e7e71c">commit 54f88a53372983c7aecacfb9a4d2fa63501fda58</span>
<span style="color: #e7e71c">commit fe52372519f5152cb7198467ed1a4f3c6f2bd8e5</span>
Author: some.committer &lt;some.committer@chromium.org&gt;
Date: Thu Apr 10 08:54:46 2014 +0000
This change is horribly broken.
# Now do the revert.
<span style="font-weight: bold; color: #ffffff">$ git revert 54f88a53372983c7aecacfb9a4d2fa63501fda58</span>
<span style="font-weight: bold; color: #ffffff">$ git revert fe52372519f5152cb7198467ed1a4f3c6f2bd8e5</span>
# That reverted the change and committed the revert.
<span style="font-weight: bold; color: #ffffff">$ git log -n 1</span>
<span style="color: #e7e71c">commit 4d932bdd1071e318e6a4d3d6fd6034f9105cad5a</span>
<span style="color: #e7e71c">commit 72fef2931683370c31c218f114deed6f507df942</span>
Author: you &lt;you@chromium.org&gt;
Date: Thu Apr 10 09:11:36 2014 +0000
Revert "This change is horribly broken."
This reverts commit 54f88a53372983c7aecacfb9a4d2fa63501fda58.
This reverts commit fe52372519f5152cb7198467ed1a4f3c6f2bd8e5.
# As with old drover, reverts are generally OK to commit without LGTM.
<span style="font-weight: bold; color: #ffffff">$ git cl upload -r some.committer@chromium.org --send-mail</span>
......@@ -976,7 +977,7 @@ button on the original cherrypick CL.</p></div>
# Here's a commit (from some.committer) that we want to 'drover'.
<span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</span>
<span style="color: #e7e71c">commit 8ed5a6585548f2092890b404f6ff49bd5ce6ab9a</span>
<span style="color: #e7e71c">commit 068a64822d90ab3b918425679816aee2d9be1e24</span>
Author: some.committer &lt;some.committer@chromium.org&gt;
AuthorDate: Thu Apr 10 08:54:46 2014 +0000
Commit: some.committer &lt;some.committer@chromium.org&gt;
......@@ -990,8 +991,8 @@ Branch 'drover_9999' set up to track remote ref 'refs/branch-heads/9999'.
# Now do the 'drover'.
# IMPORTANT!!! Do Not leave off the '-x' flag
<span style="font-weight: bold; color: #ffffff">$ git cherry-pick -x 8ed5a6585548f2092890b404f6ff49bd5ce6ab9a</span>
[drover_9999 77a956b] This change needs to go to branch 9999
<span style="font-weight: bold; color: #ffffff">$ git cherry-pick -x 068a64822d90ab3b918425679816aee2d9be1e24</span>
[drover_9999 cda4a18] This change needs to go to branch 9999
Author: some.committer &lt;some.committer@chromium.org&gt;
Date: Thu Apr 10 08:54:46 2014 +0000
1 file changed, 1 insertion(+)
......@@ -1000,7 +1001,7 @@ Branch 'drover_9999' set up to track remote ref 'refs/branch-heads/9999'.
# That took the code authored by some.committer and committed it to
# the branch by the person who drovered it (i.e. you).
<span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</span>
<span style="color: #e7e71c">commit 77a956ba0f28eb29ed009f58a5d71b6a10283358</span>
<span style="color: #e7e71c">commit cda4a18321ef3f603e955da6e263b6cadff11885</span>
Author: some.committer &lt;some.committer@chromium.org&gt;
AuthorDate: Thu Apr 10 08:54:46 2014 +0000
Commit: you &lt;you@chromium.org&gt;
......@@ -1008,7 +1009,7 @@ CommitDate: Thu Apr 10 09:11:36 2014 +0000
This change needs to go to branch 9999
(cherry picked from commit 8ed5a6585548f2092890b404f6ff49bd5ce6ab9a)
(cherry picked from commit 068a64822d90ab3b918425679816aee2d9be1e24)
# Looks good. Ship it!
<span style="font-weight: bold; color: #ffffff">$ git cl upload</span>
......@@ -1041,7 +1042,8 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
Last updated 2020-08-10 17:51:13 CEST
Last updated
2021-07-01 07:07:00 PDT
</div>
</div>
</body>
......
man/html/git-footers.html
View file @ 26adc2a9
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
<meta name="generator" content="AsciiDoc 8.6.9" />
<meta name="generator" content="AsciiDoc 9.1.0" />
<title>git-footers(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
......@@ -435,7 +436,7 @@ thead, p.table.header {
p.table {
margin-top: 0;
}
/* Because the table frame attribute is overriden by CSS in most browsers. */
/* Because the table frame attribute is overridden by CSS in most browsers. */
div.tableblock > table[frame="void"] {
border-style: none;
}
......@@ -871,7 +872,8 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
Last updated 2020-08-10 17:51:13 CEST
Last updated
2021-07-01 07:07:00 PDT
</div>
</div>
</body>
......
man/html/git-freeze.html
View file @ 26adc2a9
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
<meta name="generator" content="AsciiDoc 8.6.9" />
<meta name="generator" content="AsciiDoc 9.1.0" />
<title>git-freeze(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
......@@ -435,7 +436,7 @@ thead, p.table.header {
p.table {
margin-top: 0;
}
/* Because the table frame attribute is overriden by CSS in most browsers. */
/* Because the table frame attribute is overridden by CSS in most browsers. */
div.tableblock > table[frame="void"] {
border-style: none;
}
......@@ -790,7 +791,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 status --short</span>
<span style="font-weight: bold; color: #ffffff">$ git log -n 2 --stat</span>
<span style="color: #e7e71c">commit 7aeb49f4c5b451bbb7eacecae9d505d7225b93b4</span>
<span style="color: #e7e71c">commit 2b8214881eb8a660a86c0551f84eb39e6763acf3</span>
Author: local &lt;local@chromium.org&gt;
Date: Thu Apr 10 08:54:56 2014 +0000
......@@ -802,7 +803,7 @@ Date: Thu Apr 10 08:54:56 2014 +0000
unstaged_deleted_file | 1 <span style="color: #e42e16">-</span>
4 files changed, 2 insertions(+), 1 deletion(-)
<span style="color: #e7e71c">commit d0f7d7d198cc9274ef8e7467a4a817a47eb80a13</span>
<span style="color: #e7e71c">commit 4e1ca78d22a542047891f597545223dc6ce1b757</span>
Author: local &lt;local@chromium.org&gt;
Date: Thu Apr 10 08:54:56 2014 +0000
......@@ -852,7 +853,8 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
Last updated 2020-08-10 17:51:13 CEST
Last updated
2021-07-01 07:07:00 PDT
</div>
</div>
</body>
......
man/html/git-hyper-blame.html
View file @ 26adc2a9
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
<meta name="generator" content="AsciiDoc 8.6.9" />
<meta name="generator" content="AsciiDoc 9.1.0" />
<title>git-hyper-blame(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
......@@ -435,7 +436,7 @@ thead, p.table.header {
p.table {
margin-top: 0;
}
/* Because the table frame attribute is overriden by CSS in most browsers. */
/* Because the table frame attribute is overridden by CSS in most browsers. */
div.tableblock > table[frame="void"] {
border-style: none;
}
......@@ -871,7 +872,8 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
Last updated 2020-08-10 17:51:13 CEST
Last updated
2021-07-01 07:07:00 PDT
</div>
</div>
</body>
......
man/html/git-map-branches.html
View file @ 26adc2a9
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
<meta name="generator" content="AsciiDoc 8.6.9" />
<meta name="generator" content="AsciiDoc 9.1.0" />
<title>git-map-branches(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
......@@ -435,7 +436,7 @@ thead, p.table.header {
p.table {
margin-top: 0;
}
/* Because the table frame attribute is overriden by CSS in most browsers. */
/* Because the table frame attribute is overridden by CSS in most browsers. */
div.tableblock > table[frame="void"] {
border-style: none;
}
......@@ -857,9 +858,9 @@ assuming that the <code>frozen_changes</code> branch was currently checked out,
</span><span style="color: #19c518"></span><span style="color: #19c518"> fixit
</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5"> frozen_branch *
</span><span style="font-weight: bold; color: #ffffff">$ git map-branches -v</span>
<span style="color: #d338d3"></span><span style="color: #d338d3">{NO_UPSTREAM} </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">
</span><span style="color: #19c518"></span><span style="color: #19c518"> no_upstream </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">
</span><span style="color: #e42e16"></span><span style="color: #e42e16">origin/main </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">
<span style="color: #d338d3"></span><span style="color: #d338d3">{NO_UPSTREAM} </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">
</span><span style="color: #19c518"></span><span style="color: #19c518"> no_upstream </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">
</span><span style="color: #e42e16"></span><span style="color: #e42e16">origin/main </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">
</span><span style="color: #19c518"></span><span style="color: #19c518"> cool_feature </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">4 commits </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">]
</span><span style="color: #19c518"></span><span style="color: #19c518"> subfeature </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">2 commits </span><span style="color: #ffffff">| </span><span style="color: #d338d3">behind 1 </span><span style="color: #ffffff">]
</span><span style="color: #19c518"></span><span style="color: #19c518"> fixit </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">2 commits </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">]
......@@ -897,7 +898,8 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
Last updated 2020-08-10 17:51:13 CEST
Last updated
2021-07-01 07:07:00 PDT
</div>
</div>
</body>
......
man/html/git-map.html
View file @ 26adc2a9
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
<meta name="generator" content="AsciiDoc 8.6.9" />
<meta name="generator" content="AsciiDoc 9.1.0" />
<title>git-map(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
......@@ -435,7 +436,7 @@ thead, p.table.header {
p.table {
margin-top: 0;
}
/* Because the table frame attribute is overriden by CSS in most browsers. */
/* Because the table frame attribute is overridden by CSS in most browsers. */
div.tableblock > table[frame="void"] {
border-style: none;
}
......@@ -835,26 +836,26 @@ configure this, use git <code>config --add depot-tools.map-extra &lt;value&gt;</
<div class="sectionbody">
<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>
* <span style="font-weight: bold; color: #e42e16">d0fb9c7 </span><span style="color: #19c518"> (</span><span style="color: #e42e16">HEAD -&gt; frozen_branch</span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ FREEZE.unindexed
* <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">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">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">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">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">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">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="font-weight: bold; color: #e42e16">d0fb9c7283</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">HEAD -&gt; frozen_branch</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ FREEZE.unindexed
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">f48f415e0f</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ modfile
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">4c5b9c0afd</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ a deleted file
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">f7ce1e4b36</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; 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="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ Add neat feature
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">3726937ae6</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Epic README update
<span style="color: #e42e16">|</span> * <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">14db2e5a60</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; 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="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></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="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">ee3f972810</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; 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="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ integrate with CoolService
<span style="color: #e42e16">|</span> <span style="color: #19c518">|</span> * <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">4f9f5082c8</span><span style="font-weight: bold"></span><span style="font-weight: bold"></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="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">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">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="font-weight: bold; color: #e42e16">7d84f8580a</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ another improvement &lt;(<span style="color: #ffffff"></span><span style="font-weight: bold; color: #ffffff">subfeature</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>)
<span style="color: #e42e16">|</span> * <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">27abea4b40</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; 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="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ Refactor spleen
<span style="color: #e42e16">|</span> * <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">d8abe739e3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Add widget
<span style="color: #e42e16">|</span><span style="color: #e42e16">/</span>
* <span style="font-weight: bold; color: #e42e16">beec6f4 </span><span style="color: #19c518"> (</span><span style="color: #e42e16">origin/main</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">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">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">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">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">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="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">beec6f4746</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #e42e16">origin/main</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">, </span><span style="font-weight: bold; color: #e42e16">origin/HEAD</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ Make ReflectorImpl use mailboxes &lt;(<span style="color: #ffffff"></span><span style="font-weight: bold; color: #ffffff">cool_feature, fixit</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">41290e02b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ don't use glibc-specific execinfo.h on uclibc builds
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">a76fde7b7b</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ [fsp] Add requestUnmount() method together with the request manager.
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">9de7a713b3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ linux_aura: Use system configuration for middle clicking the titlebar.
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">073b0c203a</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ ContentView-&gt;ContentViewCore in ContentViewRenderView
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">2250f532d7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ ozone: evdev: Filter devices by path
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">33a7a742b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></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>
<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>
......@@ -880,7 +881,8 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
Last updated 2020-08-10 17:51:13 CEST
Last updated
2021-07-01 07:07:00 PDT
</div>
</div>
</body>
......
man/html/git-mark-merge-base.html
View file @ 26adc2a9
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
<meta name="generator" content="AsciiDoc 8.6.9" />
<meta name="generator" content="AsciiDoc 9.1.0" />
<title>git-mark-merge-base(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
......@@ -435,7 +436,7 @@ thead, p.table.header {
p.table {
margin-top: 0;
}
/* Because the table frame attribute is overriden by CSS in most browsers. */
/* Because the table frame attribute is overridden by CSS in most browsers. */
div.tableblock > table[frame="void"] {
border-style: none;
}
......@@ -819,7 +820,8 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
Last updated 2020-08-10 17:51:13 CEST
Last updated
2021-07-01 07:07:00 PDT
</div>
</div>
</body>
......
man/html/git-nav-downstream.html
View file @ 26adc2a9
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
<meta name="generator" content="AsciiDoc 8.6.9" />
<meta name="generator" content="AsciiDoc 9.1.0" />
<title>git-nav-downstream(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
......@@ -435,7 +436,7 @@ thead, p.table.header {
p.table {
margin-top: 0;
}
/* Because the table frame attribute is overriden by CSS in most browsers. */
/* Because the table frame attribute is overridden by CSS in most browsers. */
div.tableblock > table[frame="void"] {
border-style: none;
}
......@@ -837,7 +838,8 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
Last updated 2020-08-10 17:51:13 CEST
Last updated
2021-07-01 07:07:00 PDT
</div>
</div>
</body>
......
man/html/git-nav-upstream.html
View file @ 26adc2a9
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
<meta name="generator" content="AsciiDoc 8.6.9" />
<meta name="generator" content="AsciiDoc 9.1.0" />
<title>git-nav-upstream(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
......@@ -435,7 +436,7 @@ thead, p.table.header {
p.table {
margin-top: 0;
}
/* Because the table frame attribute is overriden by CSS in most browsers. */
/* Because the table frame attribute is overridden by CSS in most browsers. */
div.tableblock > table[frame="void"] {
border-style: none;
}
......@@ -846,7 +847,8 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
Last updated 2020-08-10 17:51:13 CEST
Last updated
2021-07-01 07:07:00 PDT
</div>
</div>
</body>
......
man/html/git-new-branch.html
View file @ 26adc2a9
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
<meta name="generator" content="AsciiDoc 8.6.9" />
<meta name="generator" content="AsciiDoc 9.1.0" />
<title>git-new-branch(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
......@@ -435,7 +436,7 @@ thead, p.table.header {
p.table {
margin-top: 0;
}
/* Because the table frame attribute is overriden by CSS in most browsers. */
/* Because the table frame attribute is overridden by CSS in most browsers. */
div.tableblock > table[frame="void"] {
border-style: none;
}
......@@ -759,7 +760,7 @@ git-new-branch(1) Manual Page
<em>git new-branch</em> --upstream_current &lt;branch_name&gt;
<em>git new-branch</em> --upstream &lt;REF&gt; &lt;branch_name&gt;
<em>git new-branch</em> --lkgr &lt;branch_name&gt;
<em>git new-branch</em> --inject_current&lt;branch_name&gt;</pre>
<em>git new-branch</em> --inject_current &lt;branch_name&gt;</pre>
<div class="attribution">
</div></div>
</div>
......@@ -816,12 +817,12 @@ new-branch --upstream_current &lt;branch_name&gt;</code>.</p></div>
tracking (upstream) branch of the currently-checked-out branch and set the
tracking (upstream) branch of the currently-checked-out branch to the
newly-created branch.
<br>
<br>
Before: current &gt; upstream
<br>
After: current &gt; new &gt; upstream
</p>
<div class="literalblock">
<div class="content">
<pre><code>Before: current &gt; upstream
After: current &gt; new &gt; upstream</code></pre>
</div></div>
</dd>
<dt class="hdlist1">
&lt;branch_name&gt;
......@@ -849,66 +850,65 @@ This is considered to be the <em>root</em> branch.</p></div>
<h2 id="_example">EXAMPLE</h2>
<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-branches -v</span>
<span style="color: #e42e16"></span><span style="color: #e42e16">origin/main </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">
</span><span style="color: #19c518"></span><span style="color: #19c518"> cool_feature </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">ahead 4 </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">]
</span><span style="color: #19c518"></span><span style="color: #19c518"> subfeature </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">ahead 2 </span><span style="color: #ffffff">| </span><span style="color: #d338d3">behind 1 </span><span style="color: #ffffff">]
</span><span style="color: #19c518"></span><span style="color: #19c518"> fixit </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">ahead 2 </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">]
</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5"> frozen_branch * </span><span style="font-weight: bold; color: #ffffff">[ </span><span style="font-weight: bold; color: #d338d3">ahead 3 </span><span style="font-weight: bold; color: #ffffff"> </span><span style="font-weight: bold; color: #d338d3"> </span><span style="font-weight: bold; color: #ffffff">]
<span style="color: #e42e16"></span><span style="color: #e42e16">origin/main </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">
</span><span style="color: #19c518"></span><span style="color: #19c518"> cool_feature </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">4 commits </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">]
</span><span style="color: #19c518"></span><span style="color: #19c518"> subfeature </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">2 commits </span><span style="color: #ffffff">| </span><span style="color: #d338d3">behind 1 </span><span style="color: #ffffff">]
</span><span style="color: #19c518"></span><span style="color: #19c518"> fixit </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">2 commits </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">]
</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5"> frozen_branch * </span><span style="font-weight: bold; color: #ffffff">[ </span><span style="font-weight: bold; color: #d338d3">3 commits </span><span style="font-weight: bold; color: #ffffff"> </span><span style="font-weight: bold; color: #d338d3"> </span><span style="font-weight: bold; color: #ffffff">]
</span><span style="font-weight: bold; color: #ffffff">$ git new-branch independent_cl</span>
<span style="font-weight: bold; color: #ffffff">$ git map-branches -v</span>
<span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">origin/main </span><span style="font-weight: bold; color: #ffffff"> </span><span style="font-weight: bold; color: #d338d3"> </span><span style="font-weight: bold; color: #ffffff"> </span><span style="font-weight: bold; color: #d338d3"> </span><span style="font-weight: bold; color: #ffffff">
</span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518"> cool_feature </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">ahead 4 </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">]
</span><span style="color: #19c518"></span><span style="color: #19c518"> subfeature </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">ahead 2 </span><span style="color: #ffffff">| </span><span style="color: #d338d3">behind 1 </span><span style="color: #ffffff">]
</span><span style="color: #19c518"></span><span style="color: #19c518"> fixit </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">ahead 2 </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">]
</span><span style="color: #19c518"></span><span style="color: #19c518"> frozen_branch </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">ahead 3 </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">]
</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5"> independent_cl * </span><span style="font-weight: bold; color: #ffffff"> </span><span style="font-weight: bold; color: #d338d3"> </span><span style="font-weight: bold; color: #ffffff"> </span><span style="font-weight: bold; color: #d338d3"> </span><span style="font-weight: bold; color: #ffffff">
<span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">origin/main </span><span style="font-weight: bold; color: #ffffff"> </span><span style="font-weight: bold; color: #d338d3"> </span><span style="font-weight: bold; color: #ffffff"> </span><span style="font-weight: bold; color: #d338d3"> </span><span style="font-weight: bold; color: #ffffff">
</span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518"> cool_feature </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">4 commits </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">]
</span><span style="color: #19c518"></span><span style="color: #19c518"> subfeature </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">2 commits </span><span style="color: #ffffff">| </span><span style="color: #d338d3">behind 1 </span><span style="color: #ffffff">]
</span><span style="color: #19c518"></span><span style="color: #19c518"> fixit </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">2 commits </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">]
</span><span style="color: #19c518"></span><span style="color: #19c518"> frozen_branch </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">3 commits </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">]
</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5"> independent_cl * </span><span style="font-weight: bold; color: #ffffff"> </span><span style="font-weight: bold; color: #d338d3"> </span><span style="font-weight: bold; color: #ffffff"> </span><span style="font-weight: bold; color: #d338d3"> </span><span style="font-weight: bold; color: #ffffff">
</span><span style="font-weight: bold; color: #ffffff">$ vi foo &amp;&amp; git add -A &amp;&amp; git commit -m foo</span>
<span style="font-weight: bold; color: #ffffff">$ git map-branches -v</span>
<span style="color: #e42e16"></span><span style="color: #e42e16">origin/main </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">
</span><span style="color: #19c518"></span><span style="color: #19c518"> cool_feature </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">ahead 4 </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">]
</span><span style="color: #19c518"></span><span style="color: #19c518"> subfeature </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">ahead 2 </span><span style="color: #ffffff">| </span><span style="color: #d338d3">behind 1 </span><span style="color: #ffffff">]
</span><span style="color: #19c518"></span><span style="color: #19c518"> fixit </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">ahead 2 </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">]
</span><span style="color: #19c518"></span><span style="color: #19c518"> frozen_branch </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">ahead 3 </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">]
</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5"> independent_cl * </span><span style="font-weight: bold; color: #ffffff">[ </span><span style="font-weight: bold; color: #d338d3">ahead 1 </span><span style="font-weight: bold; color: #ffffff"> </span><span style="font-weight: bold; color: #d338d3"> </span><span style="font-weight: bold; color: #ffffff">]
<span style="color: #e42e16"></span><span style="color: #e42e16">origin/main </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">
</span><span style="color: #19c518"></span><span style="color: #19c518"> cool_feature </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">4 commits </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">]
</span><span style="color: #19c518"></span><span style="color: #19c518"> subfeature </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">2 commits </span><span style="color: #ffffff">| </span><span style="color: #d338d3">behind 1 </span><span style="color: #ffffff">]
</span><span style="color: #19c518"></span><span style="color: #19c518"> fixit </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">2 commits </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">]
</span><span style="color: #19c518"></span><span style="color: #19c518"> frozen_branch </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">3 commits </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">]
</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5"> independent_cl * </span><span style="font-weight: bold; color: #ffffff">[ </span><span style="font-weight: bold; color: #d338d3">1 commit </span><span style="font-weight: bold; color: #ffffff"> </span><span style="font-weight: bold; color: #d338d3"> </span><span style="font-weight: bold; color: #ffffff">]
</span><span style="font-weight: bold; color: #ffffff">$ git new-branch --upstream subfeature nested_cl</span>
<span style="font-weight: bold; color: #ffffff">$ git map-branches -v</span>
<span style="color: #e42e16"></span><span style="color: #e42e16">origin/main </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">
</span><span style="color: #19c518"></span><span style="color: #19c518"> cool_feature </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">ahead 4 </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">]
</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5"> subfeature </span><span style="font-weight: bold; color: #ffffff">[ </span><span style="font-weight: bold; color: #d338d3">ahead 2 </span><span style="font-weight: bold; color: #ffffff">| </span><span style="font-weight: bold; color: #d338d3">behind 1 </span><span style="font-weight: bold; color: #ffffff">]</span> <b>&lt;1&gt;</b><span>
</span><span style="font-weight: bold; color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5"> nested_cl * </span><span style="font-weight: bold; color: #ffffff"> </span><span style="font-weight: bold; color: #d338d3"> </span><span style="font-weight: bold; color: #ffffff"> </span><span style="font-weight: bold; color: #d338d3"> </span><span style="font-weight: bold; color: #ffffff">
</span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518"> fixit </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">ahead 2 </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">]
</span><span style="color: #19c518"></span><span style="color: #19c518"> frozen_branch </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">ahead 3 </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">]
</span><span style="color: #19c518"></span><span style="color: #19c518"> independent_cl </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">ahead 1 </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">]
<span style="color: #e42e16"></span><span style="color: #e42e16">origin/main </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">
</span><span style="color: #19c518"></span><span style="color: #19c518"> cool_feature </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">4 commits </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">]
</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5"> subfeature </span><span style="font-weight: bold; color: #ffffff">[ </span><span style="font-weight: bold; color: #d338d3">2 commits </span><span style="font-weight: bold; color: #ffffff">| </span><span style="font-weight: bold; color: #d338d3">behind 1 </span><span style="font-weight: bold; color: #ffffff">]</span> <b>&lt;1&gt;</b><span>
</span><span style="font-weight: bold; color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5"> nested_cl * </span><span style="font-weight: bold; color: #ffffff"> </span><span style="font-weight: bold; color: #d338d3"> </span><span style="font-weight: bold; color: #ffffff"> </span><span style="font-weight: bold; color: #d338d3"> </span><span style="font-weight: bold; color: #ffffff">
</span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518"> fixit </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">2 commits </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">]
</span><span style="color: #19c518"></span><span style="color: #19c518"> frozen_branch </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">3 commits </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">]
</span><span style="color: #19c518"></span><span style="color: #19c518"> independent_cl </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">1 commit </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">]
</span><span style="font-weight: bold; color: #ffffff">$ git checkout cool_feature</span>
Switched to branch 'cool_feature'
Your branch is ahead of 'origin/main' by 4 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 map-branches -v</span>
<span style="color: #e42e16"></span><span style="color: #e42e16">origin/main </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">
</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5"> cool_feature </span><span style="font-weight: bold; color: #ffffff">[ </span><span style="font-weight: bold; color: #d338d3">ahead 4 </span><span style="font-weight: bold; color: #ffffff"> </span><span style="font-weight: bold; color: #d338d3"> </span><span style="font-weight: bold; color: #ffffff">]
</span><span style="font-weight: bold; color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5"> cl_depends_on_cool_feature * </span><span style="font-weight: bold; color: #ffffff"> </span><span style="font-weight: bold; color: #d338d3"> </span><span style="font-weight: bold; color: #ffffff"> </span><span style="font-weight: bold; color: #d338d3"> </span><span style="font-weight: bold; color: #ffffff">
</span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518"> subfeature </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">ahead 2 </span><span style="color: #ffffff">| </span><span style="color: #d338d3">behind 1 </span><span style="color: #ffffff">]
</span><span style="color: #19c518"></span><span style="color: #19c518"> nested_cl </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">
</span><span style="color: #19c518"></span><span style="color: #19c518"> fixit </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">ahead 2 </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">]
</span><span style="color: #19c518"></span><span style="color: #19c518"> frozen_branch </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">ahead 3 </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">]
</span><span style="color: #19c518"></span><span style="color: #19c518"> independent_cl </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">ahead 1 </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">]
<span style="color: #e42e16"></span><span style="color: #e42e16">origin/main </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">
</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5"> cool_feature </span><span style="font-weight: bold; color: #ffffff">[ </span><span style="font-weight: bold; color: #d338d3">4 commits </span><span style="font-weight: bold; color: #ffffff"> </span><span style="font-weight: bold; color: #d338d3"> </span><span style="font-weight: bold; color: #ffffff">]
</span><span style="font-weight: bold; color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5"> cl_depends_on_cool_feature * </span><span style="font-weight: bold; color: #ffffff"> </span><span style="font-weight: bold; color: #d338d3"> </span><span style="font-weight: bold; color: #ffffff"> </span><span style="font-weight: bold; color: #d338d3"> </span><span style="font-weight: bold; color: #ffffff">
</span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518"> subfeature </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">2 commits </span><span style="color: #ffffff">| </span><span style="color: #d338d3">behind 1 </span><span style="color: #ffffff">]
</span><span style="color: #19c518"></span><span style="color: #19c518"> nested_cl </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">
</span><span style="color: #19c518"></span><span style="color: #19c518"> fixit </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">2 commits </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">]
</span><span style="color: #19c518"></span><span style="color: #19c518"> frozen_branch </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">3 commits </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">]
</span><span style="color: #19c518"></span><span style="color: #19c518"> independent_cl </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">1 commit </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">]
</span><span style="font-weight: bold; color: #ffffff">$ git checkout subfeature</span>
Switched to branch 'subfeature'
Your branch and 'cool_feature' have diverged,
and have 2 and 1 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
<span style="font-weight: bold; color: #ffffff">$ git new-branch --inject_current injected_cl</span>
<span style="font-weight: bold; color: #ffffff">$ git map-branches -v</span>
<span style="color: #e42e16"></span><span style="color: #e42e16">origin/main </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">
</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5"> cool_feature </span><span style="font-weight: bold; color: #ffffff">[ </span><span style="font-weight: bold; color: #d338d3">ahead 4 </span><span style="font-weight: bold; color: #ffffff"> </span><span style="font-weight: bold; color: #d338d3"> </span><span style="font-weight: bold; color: #ffffff">]</span> <b>&lt;1&gt;</b><span>
</span><span style="font-weight: bold; color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5"> cl_depends_on_cool_feature </span><span style="font-weight: bold; color: #ffffff"> </span><span style="font-weight: bold; color: #d338d3"> </span><span style="font-weight: bold; color: #ffffff"> </span><span style="font-weight: bold; color: #d338d3"> </span><span style="font-weight: bold; color: #ffffff">
</span><span style="font-weight: bold; color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5"> injected_cl * </span><span style="font-weight: bold; color: #ffffff"> </span><span style="font-weight: bold; color: #d338d3"> </span><span style="font-weight: bold; color: #ffffff"> </span><span style="font-weight: bold; color: #d338d3"> </span><span style="font-weight: bold; color: #ffffff">
</span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518"> subfeature </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">ahead 2 </span><span style="color: #ffffff">| </span><span style="color: #d338d3">behind 1 </span><span style="color: #ffffff">]
</span><span style="color: #19c518"></span><span style="color: #19c518"> nested_cl </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">
</span><span style="color: #19c518"></span><span style="color: #19c518"> fixit </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">ahead 2 </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">]
</span><span style="color: #19c518"></span><span style="color: #19c518"> frozen_branch </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">ahead 3 </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">]
</span><span style="color: #19c518"></span><span style="color: #19c518"> independent_cl </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">ahead 1 </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">]</span>
<span style="color: #e42e16"></span><span style="color: #e42e16">origin/main </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">
</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5"> cool_feature </span><span style="font-weight: bold; color: #ffffff">[ </span><span style="font-weight: bold; color: #d338d3">4 commits </span><span style="font-weight: bold; color: #ffffff"> </span><span style="font-weight: bold; color: #d338d3"> </span><span style="font-weight: bold; color: #ffffff">]
</span><span style="font-weight: bold; color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5"> cl_depends_on_cool_feature </span><span style="font-weight: bold; color: #ffffff"> </span><span style="font-weight: bold; color: #d338d3"> </span><span style="font-weight: bold; color: #ffffff"> </span><span style="font-weight: bold; color: #d338d3"> </span><span style="font-weight: bold; color: #ffffff">
</span><span style="font-weight: bold; color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5"> injected_cl * </span><span style="font-weight: bold; color: #ffffff"> </span><span style="font-weight: bold; color: #d338d3"> </span><span style="font-weight: bold; color: #ffffff"> </span><span style="font-weight: bold; color: #d338d3"> </span><span style="font-weight: bold; color: #ffffff">
</span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518"> subfeature </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">2 commits </span><span style="color: #ffffff">| </span><span style="color: #d338d3">behind 1 </span><span style="color: #ffffff">]
</span><span style="color: #19c518"></span><span style="color: #19c518"> nested_cl </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">
</span><span style="color: #19c518"></span><span style="color: #19c518"> fixit </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">2 commits </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">]
</span><span style="color: #19c518"></span><span style="color: #19c518"> frozen_branch </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">3 commits </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">]
</span><span style="color: #19c518"></span><span style="color: #19c518"> independent_cl </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">1 commit </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">]</span>
</code></pre></div></div><p><div class="paragraph"></p></div>
<div class="olist arabic"><ol class="arabic">
<li>
......@@ -959,7 +959,8 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
Last updated 2021-01-25 15:02:46 PST
Last updated
2021-07-01 07:07:00 PDT
</div>
</div>
</body>
......
man/html/git-rebase-update.html
View file @ 26adc2a9
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
<meta name="generator" content="AsciiDoc 8.6.9" />
<meta name="generator" content="AsciiDoc 9.1.0" />
<title>git-rebase-update(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
......@@ -435,7 +436,7 @@ thead, p.table.header {
p.table {
margin-top: 0;
}
/* Because the table frame attribute is overriden by CSS in most browsers. */
/* Because the table frame attribute is overridden by CSS in most browsers. */
div.tableblock > table[frame="void"] {
border-style: none;
}
......@@ -954,7 +955,8 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
Last updated 2020-08-10 17:51:13 CEST
Last updated
2021-07-01 07:07:00 PDT
</div>
</div>
</body>
......
man/html/git-rename-branch.html
View file @ 26adc2a9
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
<meta name="generator" content="AsciiDoc 8.6.9" />
<meta name="generator" content="AsciiDoc 9.1.0" />
<title>git-rename-branch(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
......@@ -435,7 +436,7 @@ thead, p.table.header {
p.table {
margin-top: 0;
}
/* Because the table frame attribute is overriden by CSS in most browsers. */
/* Because the table frame attribute is overridden by CSS in most browsers. */
div.tableblock > table[frame="void"] {
border-style: none;
}
......@@ -787,7 +788,8 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
Last updated 2020-08-10 17:51:13 CEST
Last updated
2021-07-01 07:07:00 PDT
</div>
</div>
</body>
......
man/html/git-reparent-branch.html
View file @ 26adc2a9
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
<meta name="generator" content="AsciiDoc 8.6.9" />
<meta name="generator" content="AsciiDoc 9.1.0" />
<title>git-reparent-branch(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
......@@ -435,7 +436,7 @@ thead, p.table.header {
p.table {
margin-top: 0;
}
/* Because the table frame attribute is overriden by CSS in most browsers. */
/* Because the table frame attribute is overridden by CSS in most browsers. */
div.tableblock > table[frame="void"] {
border-style: none;
}
......@@ -840,7 +841,8 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
Last updated 2020-08-10 17:51:13 CEST
Last updated
2021-07-01 07:07:00 PDT
</div>
</div>
</body>
......
man/html/git-retry.html
View file @ 26adc2a9
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
<meta name="generator" content="AsciiDoc 8.6.9" />
<meta name="generator" content="AsciiDoc 9.1.0" />
<title>git-retry(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
......@@ -435,7 +436,7 @@ thead, p.table.header {
p.table {
margin-top: 0;
}
/* Because the table frame attribute is overriden by CSS in most browsers. */
/* Because the table frame attribute is overridden by CSS in most browsers. */
div.tableblock > table[frame="void"] {
border-style: none;
}
......@@ -851,7 +852,8 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
Last updated 2020-08-10 17:51:13 CEST
Last updated
2021-07-01 07:07:00 PDT
</div>
</div>
</body>
......
man/html/git-squash-branch.html
View file @ 26adc2a9
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
<meta name="generator" content="AsciiDoc 8.6.9" />
<meta name="generator" content="AsciiDoc 9.1.0" />
<title>git-squash-branch(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
......@@ -435,7 +436,7 @@ thead, p.table.header {
p.table {
margin-top: 0;
}
/* Because the table frame attribute is overriden by CSS in most browsers. */
/* Because the table frame attribute is overridden by CSS in most browsers. */
div.tableblock > table[frame="void"] {
border-style: none;
}
......@@ -801,46 +802,47 @@ verify that the conflict diff is what you expected (and then skip it with
<h2 id="_example">EXAMPLE</h2>
<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>
* <span style="font-weight: bold; color: #e42e16">d0fb9c7 </span><span style="color: #19c518"> (</span><span style="color: #e42e16">HEAD -&gt; frozen_branch</span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ FREEZE.unindexed
* <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">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">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">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">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">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">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="font-weight: bold; color: #e42e16">d0fb9c7283</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">HEAD -&gt; frozen_branch</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ FREEZE.unindexed
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">f48f415e0f</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ modfile
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">4c5b9c0afd</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ a deleted file
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">f7ce1e4b36</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; 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="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ Add neat feature
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">3726937ae6</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Epic README update
<span style="color: #e42e16">|</span> * <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">14db2e5a60</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; 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="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></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="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">ee3f972810</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; 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="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ integrate with CoolService
<span style="color: #e42e16">|</span> <span style="color: #19c518">|</span> * <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">4f9f5082c8</span><span style="font-weight: bold"></span><span style="font-weight: bold"></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="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">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">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="font-weight: bold; color: #e42e16">7d84f8580a</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ another improvement &lt;(<span style="color: #ffffff"></span><span style="font-weight: bold; color: #ffffff">subfeature</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>)
<span style="color: #e42e16">|</span> * <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">27abea4b40</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; 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="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ Refactor spleen
<span style="color: #e42e16">|</span> * <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">d8abe739e3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Add widget
<span style="color: #e42e16">|</span><span style="color: #e42e16">/</span>
* <span style="font-weight: bold; color: #e42e16">beec6f4 </span><span style="color: #19c518"> (</span><span style="color: #e42e16">origin/main</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">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">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">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">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">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="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">beec6f4746</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #e42e16">origin/main</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">, </span><span style="font-weight: bold; color: #e42e16">origin/HEAD</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ Make ReflectorImpl use mailboxes &lt;(<span style="color: #ffffff"></span><span style="font-weight: bold; color: #ffffff">cool_feature, fixit</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">41290e02b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ don't use glibc-specific execinfo.h on uclibc builds
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">a76fde7b7b</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ [fsp] Add requestUnmount() method together with the request manager.
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">9de7a713b3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ linux_aura: Use system configuration for middle clicking the titlebar.
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">073b0c203a</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ ContentView-&gt;ContentViewCore in ContentViewRenderView
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">2250f532d7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ ozone: evdev: Filter devices by path
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">33a7a742b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></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 map</span>
* <span style="font-weight: bold; color: #e42e16">98e69e8 </span><span style="color: #19c518"> (</span><span style="color: #e42e16">HEAD -&gt; frozen_branch</span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ cool squash demo
* <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">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">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">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">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="font-weight: bold; color: #e42e16">98e69e80b9</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">HEAD -&gt; frozen_branch</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ cool squash demo
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">f7ce1e4b36</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; 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="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ Add neat feature
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">3726937ae6</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Epic README update
<span style="color: #e42e16">|</span> * <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">14db2e5a60</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; 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="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></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="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">ee3f972810</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; 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="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ integrate with CoolService
<span style="color: #e42e16">|</span> <span style="color: #19c518">|</span> * <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">4f9f5082c8</span><span style="font-weight: bold"></span><span style="font-weight: bold"></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="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">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">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="font-weight: bold; color: #e42e16">7d84f8580a</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ another improvement &lt;(<span style="color: #ffffff"></span><span style="font-weight: bold; color: #ffffff">subfeature</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>)
<span style="color: #e42e16">|</span> * <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">27abea4b40</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; 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="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ Refactor spleen
<span style="color: #e42e16">|</span> * <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">d8abe739e3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Add widget
<span style="color: #e42e16">|</span><span style="color: #e42e16">/</span>
* <span style="font-weight: bold; color: #e42e16">beec6f4 </span><span style="color: #19c518"> (</span><span style="color: #e42e16">origin/main</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">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">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">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">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">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="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">beec6f4746</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #e42e16">origin/main</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">, </span><span style="font-weight: bold; color: #e42e16">origin/HEAD</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ Make ReflectorImpl use mailboxes &lt;(<span style="color: #ffffff"></span><span style="font-weight: bold; color: #ffffff">fixit, cool_feature</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">41290e02b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ don't use glibc-specific execinfo.h on uclibc builds
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">a76fde7b7b</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ [fsp] Add requestUnmount() method together with the request manager.
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">9de7a713b3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ linux_aura: Use system configuration for middle clicking the titlebar.
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">073b0c203a</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ ContentView-&gt;ContentViewCore in ContentViewRenderView
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">2250f532d7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #e7e71c">2014-04-10</span> ~ ozone: evdev: Filter devices by path
* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">33a7a742b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></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>
</div>
</div>
......@@ -874,7 +876,8 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
Last updated 2020-08-10 17:51:13 CEST
Last updated
2021-07-01 07:07:00 PDT
</div>
</div>
</body>
......
man/html/git-thaw.html
View file @ 26adc2a9
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
<meta name="generator" content="AsciiDoc 8.6.9" />
<meta name="generator" content="AsciiDoc 9.1.0" />
<title>git-thaw(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
......@@ -435,7 +436,7 @@ thead, p.table.header {
p.table {
margin-top: 0;
}
/* Because the table frame attribute is overriden by CSS in most browsers. */
/* Because the table frame attribute is overridden by CSS in most browsers. */
div.tableblock > table[frame="void"] {
border-style: none;
}
......@@ -787,7 +788,8 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
Last updated 2020-08-10 17:51:13 CEST
Last updated
2021-07-01 07:07:00 PDT
</div>
</div>
</body>
......
man/html/git-upstream-diff.html
View file @ 26adc2a9
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
<meta name="generator" content="AsciiDoc 8.6.9" />
<meta name="generator" content="AsciiDoc 9.1.0" />
<title>git-upstream-diff(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
......@@ -435,7 +436,7 @@ thead, p.table.header {
p.table {
margin-top: 0;
}
/* Because the table frame attribute is overriden by CSS in most browsers. */
/* Because the table frame attribute is overridden by CSS in most browsers. */
div.tableblock > table[frame="void"] {
border-style: none;
}
......@@ -916,7 +917,8 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
Last updated 2020-08-10 17:51:13 CEST
Last updated
2021-07-01 07:07:00 PDT
</div>
</div>
</body>
......
man/man1/git-cl.1
View file @ 26adc2a9
'\" t
.\" Title: git-cl
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
.\" Date: 08/10/2020
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 07/01/2021
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 8c3f7227
.\" Source: depot_tools 906b5026
.\" Language: English
.\"
.TH "GIT\-CL" "1" "08/10/2020" "depot_tools 8c3f7227" "Chromium depot_tools Manual"
.TH "GIT\-CL" "1" "07/01/2021" "depot_tools 906b5026" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......@@ -37,9 +37,9 @@ git-cl \- Interact with code reviews on Gerrit and Rietveld
.sp
.SH "DESCRIPTION"
.sp
git cl is the home of all of the tools for interacting with changelists\&.
\fBgit cl\fR is the home of all of the tools for interacting with changelists\&.
.sp
Run git cl help <subcommand> for a more detailed listing of that command and its options\&.
Run \fBgit cl help <subcommand>\fR for a more detailed listing of that command and its options\&.
.SH "SUBCOMMANDS"
.PP
archive
......
man/man1/git-drover.1
View file @ 26adc2a9
'\" t
.\" Title: git-drover
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
.\" Date: 08/10/2020
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 07/01/2021
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 8c3f7227
.\" Source: depot_tools 906b5026
.\" Language: English
.\"
.TH "GIT\-DROVER" "1" "08/10/2020" "depot_tools 8c3f7227" "Chromium depot_tools Manual"
.TH "GIT\-DROVER" "1" "07/01/2021" "depot_tools 906b5026" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......@@ -41,9 +41,9 @@ git-drover \- Apply a commit from the trunk to a release branch, or from one rel
.sp
.SH "DESCRIPTION"
.sp
git drover applies a commit to a release branch\&. It creates a new workdir from an existing checkout to avoid downloading a new checkout without affecting the existing checkout\&.
\fBgit drover\fR applies a commit to a release branch\&. It creates a new workdir from an existing checkout to avoid downloading a new checkout without affecting the existing checkout\&.
.sp
git drover does not support reverts\&. See the EXAMPLE section for the equivalent sequence of commands to run\&.
\fBgit drover\fR does not support reverts\&. See the EXAMPLE section for the equivalent sequence of commands to run\&.
.SH "OPTIONS"
.PP
\-\-branch <branch>
......@@ -101,7 +101,7 @@ Before working with branches, you must \fIgclient sync \-\-with_branch_heads\fR
.nf
# Here\*(Aqs a commit (from some\&.committer) that we want to \*(Aqdrover\*(Aq\&.
\fB$ git log \-n 1 \-\-pretty=fuller\fR
commit 1f4859134ea36bfc71bab20d4b4463908860fd04
commit 2b725ed09457c407978f3352d9df21ca0e9ec360
Author: some\&.committer <some\&.committer@chromium\&.org>
AuthorDate: Thu Apr 10 08:54:46 2014 +0000
Commit: some\&.committer <some\&.committer@chromium\&.org>
......@@ -110,10 +110,10 @@ CommitDate: Thu Apr 10 08:54:46 2014 +0000
This change needs to go to branch 9999
# Now do the \*(Aqdrover\*(Aq\&.
\fB$ git drover \-\-branch 9999 \-\-cherry\-pick 1f4859134ea36bfc71bab20d4b4463908860fd04\fR
\fB$ git drover \-\-branch 9999 \-\-cherry\-pick 2b725ed09457c407978f3352d9df21ca0e9ec360\fR
Going to cherry\-pick
"""
commit 1f4859134ea36bfc71bab20d4b4463908860fd04
commit 2b725ed09457c407978f3352d9df21ca0e9ec360
Author: some\&.committer <some\&.committer@chromium\&.org>
Date: Thu Apr 10 08:54:46 2014 +0000
......@@ -148,7 +148,7 @@ About to land on 9999\&. Continue (y/n)? y
.nf
# Here\*(Aqs a commit (from some\&.committer) that we want to \*(Aqdrover\*(Aq\&.
\fB$ git log \-n 1 \-\-pretty=fuller\fR
commit 351e3be4c0f2f65ff1bcbcafd2fd4c53ab3b4587
commit 930308494aae515233533c87d4fe289613b07129
Author: some\&.committer <some\&.committer@chromium\&.org>
AuthorDate: Thu Apr 10 08:54:46 2014 +0000
Commit: some\&.committer <some\&.committer@chromium\&.org>
......@@ -157,10 +157,10 @@ CommitDate: Thu Apr 10 08:54:46 2014 +0000
This change needs to go to branch 9999
# Now do the \*(Aqdrover\*(Aq\&.
\fB$ git drover \-\-branch 9999 \-\-cherry\-pick 351e3be4c0f2f65ff1bcbcafd2fd4c53ab3b4587\fR
\fB$ git drover \-\-branch 9999 \-\-cherry\-pick 930308494aae515233533c87d4fe289613b07129\fR
Going to cherry\-pick
"""
commit 351e3be4c0f2f65ff1bcbcafd2fd4c53ab3b4587
commit 930308494aae515233533c87d4fe289613b07129
Author: some\&.committer <some\&.committer@chromium\&.org>
Date: Thu Apr 10 08:54:46 2014 +0000
......@@ -219,24 +219,24 @@ Branch \*(Aqdrover_9999\*(Aq set up to track remote ref \*(Aqrefs/branch\-heads/
# Here\*(Aqs the commit we want to revert\&.
\fB$ git log \-n 1\fR
commit 8f0c06e50f535e3fcca2b189bb6b5d106bb1e5e6
commit 95b57f29626b892a27e6c15ef65097d92ff5ad06
Author: some\&.committer <some\&.committer@chromium\&.org>
Date: Thu Apr 10 08:54:46 2014 +0000
This change is horribly broken\&.
# Now do the revert\&.
\fB$ git revert 8f0c06e50f535e3fcca2b189bb6b5d106bb1e5e6\fR
\fB$ git revert 95b57f29626b892a27e6c15ef65097d92ff5ad06\fR
# That reverted the change and committed the revert\&.
\fB$ git log \-n 1\fR
commit 829317133eb319e61f222fea996ca2703cd27fbe
commit 471e1016918da2858a2a83ebd2cf7a8165f915f2
Author: you <you@chromium\&.org>
Date: Thu Apr 10 09:11:36 2014 +0000
Revert "This change is horribly broken\&."
This reverts commit 8f0c06e50f535e3fcca2b189bb6b5d106bb1e5e6\&.
This reverts commit 95b57f29626b892a27e6c15ef65097d92ff5ad06\&.
# As with old drover, reverts are generally OK to commit without LGTM\&.
\fB$ git cl upload \-r some\&.committer@chromium\&.org \-\-send\-mail\fR
......@@ -269,7 +269,7 @@ If your cherrypick onto a release branch gets reverted, do not create a new cher
# Here\*(Aqs a commit (from some\&.committer) that we want to \*(Aqdrover\*(Aq\&.
\fB$ git log \-n 1 \-\-pretty=fuller\fR
commit ceb84b4befd7a7c060d210fdc57b3d0f46d68fa4
commit f92d9f7d7a38ee974538eae525db4830d93f8908
Author: some\&.committer <some\&.committer@chromium\&.org>
AuthorDate: Thu Apr 10 08:54:46 2014 +0000
Commit: some\&.committer <some\&.committer@chromium\&.org>
......@@ -283,8 +283,8 @@ Branch \*(Aqdrover_9999\*(Aq set up to track remote ref \*(Aqrefs/branch\-heads/
# Now do the \*(Aqdrover\*(Aq\&.
# IMPORTANT!!! Do Not leave off the \*(Aq\-x\*(Aq flag
\fB$ git cherry\-pick \-x ceb84b4befd7a7c060d210fdc57b3d0f46d68fa4\fR
[drover_9999 bd9bd5b] This change needs to go to branch 9999
\fB$ git cherry\-pick \-x f92d9f7d7a38ee974538eae525db4830d93f8908\fR
[drover_9999 50bb9b6] This change needs to go to branch 9999
Author: some\&.committer <some\&.committer@chromium\&.org>
Date: Thu Apr 10 08:54:46 2014 +0000
1 file changed, 1 insertion(+)
......@@ -293,7 +293,7 @@ Branch \*(Aqdrover_9999\*(Aq set up to track remote ref \*(Aqrefs/branch\-heads/
# That took the code authored by some\&.committer and committed it to
# the branch by the person who drovered it (i\&.e\&. you)\&.
\fB$ git log \-n 1 \-\-pretty=fuller\fR
commit bd9bd5b74ab9b942d127ddbefb99eec50b65fbf1
commit 50bb9b6c903108d2e3ce76c90a5810936af017d7
Author: some\&.committer <some\&.committer@chromium\&.org>
AuthorDate: Thu Apr 10 08:54:46 2014 +0000
Commit: you <you@chromium\&.org>
......@@ -301,7 +301,7 @@ CommitDate: Thu Apr 10 09:11:36 2014 +0000
This change needs to go to branch 9999
(cherry picked from commit ceb84b4befd7a7c060d210fdc57b3d0f46d68fa4)
(cherry picked from commit f92d9f7d7a38ee974538eae525db4830d93f8908)
# Looks good\&. Ship it!
\fB$ git cl upload\fR
......@@ -314,7 +314,7 @@ CommitDate: Thu Apr 10 09:11:36 2014 +0000
.\}
.sp
.sp
If git cl upload errors out, the branch you\(cqre uploading to probably has a CL with the same Change\-Id\&. Instead of cherry\-picking manually, use the Reland button in the Gerrit UI to create a new CL, and patch that CL into your client\&.
If \fBgit cl upload\fR errors out, the branch you\(cqre uploading to probably has a CL with the same Change\-Id\&. Instead of cherry\-picking manually, use the Reland button in the Gerrit UI to create a new CL, and patch that CL into your client\&.
.RE
.SH "SEE ALSO"
.sp
......
man/man1/git-footers.1
View file @ 26adc2a9
'\" t
.\" Title: git-footers
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
.\" Date: 08/10/2020
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 07/01/2021
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 8c3f7227
.\" Source: depot_tools 906b5026
.\" Language: English
.\"
.TH "GIT\-FOOTERS" "1" "08/10/2020" "depot_tools 8c3f7227" "Chromium depot_tools Manual"
.TH "GIT\-FOOTERS" "1" "07/01/2021" "depot_tools 906b5026" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......@@ -38,7 +38,7 @@ git-footers \- Extract meta\-information expressed as footers in a commit messag
.sp
.SH "DESCRIPTION"
.sp
git footers extracts information included in commit messages as "footers", which are roughly like HTTP headers except they are at the end\&. For example, a commit might look like:
\fBgit footers\fR extracts information included in commit messages as "footers", which are roughly like HTTP headers except they are at the end\&. For example, a commit might look like:
.sp
.if n \{\
.RS 4
......@@ -61,7 +61,7 @@ Tech\-Debt\-Introduced: 17 nanoMSOffices
.RE
.\}
.sp
git footers knows how to extract this information\&.
\fBgit footers\fR knows how to extract this information\&.
.sp
Footers are order\-independent and can appear more than once\&. Thus they are treated as a multimap\&.
.SH "OPTIONS"
......@@ -76,9 +76,9 @@ Extract all the headers associated with the given key, and print one per line\&.
\-\-position
.RS 4
Extract the Chrome commit position from the footers\&. This first attempts to get the value of the
Cr\-Commit\-Position
\fBCr\-Commit\-Position\fR
footer\&. If that doesn\(cqt exist then it tries a heuristic based on
Git\-Svn\-Id\&. Output is in one of the following forms:
\fBGit\-Svn\-Id\fR\&. Output is in one of the following forms:
.sp
.if n \{\
.RS 4
......@@ -99,9 +99,9 @@ Extracts and prints the Chrome commit position number only (292272 in the exampl
.PP
\-\-position\-ref
.RS 4
Extracts and prints the Chrome commit position ref name only (ref/heads/master
Extracts and prints the Chrome commit position ref name only (\fBref/heads/master\fR
or
refs/branch\-heads/branchname
\fBrefs/branch\-heads/branchname\fR
in the example above)\&.
.RE
.SH "EXAMPLE"
......
man/man1/git-freeze.1
View file @ 26adc2a9
'\" t
.\" Title: git-freeze
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
.\" Date: 08/10/2020
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 07/01/2021
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 8c3f7227
.\" Source: depot_tools 906b5026
.\" Language: English
.\"
.TH "GIT\-FREEZE" "1" "08/10/2020" "depot_tools 8c3f7227" "Chromium depot_tools Manual"
.TH "GIT\-FREEZE" "1" "07/01/2021" "depot_tools 906b5026" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......@@ -37,11 +37,11 @@ git-freeze \- Freeze all changes on a branch (indexed and unindexed)\&.
.sp
.SH "DESCRIPTION"
.sp
git freeze works a lot like git stash, in that it stores the current changes in your working copy and index \fIsomewhere\fR\&. Unlike git stash, git freeze stores those changes on your current branch\&. This effectively allows you to \fIpause\fR development of a branch, work on something else, and then come back to exactly the same working state later (by running git thaw)\&.
\fBgit freeze\fR works a lot like \fBgit stash\fR, in that it stores the current changes in your working copy and index \fIsomewhere\fR\&. Unlike \fBgit stash\fR, \fBgit freeze\fR stores those changes on your current branch\&. This effectively allows you to \fIpause\fR development of a branch, work on something else, and then come back to exactly the same working state later (by running \fBgit thaw\fR)\&.
.sp
git freeze will make up to 2 commits on your branch\&. A commit with the message FREEZE\&.indexed will contain all changes which you\(cqve added to your index (like with \fIgit add\fR, \fIgit mv\fR, \fIgit rm\fR, etc\&.)\&. A commit with the message FREEZE\&.unindexed will contain all changes which were not in your index at the time you ran git freeze (freshly modified files, new files, etc\&.)\&.
\fBgit freeze\fR will make up to 2 commits on your branch\&. A commit with the message \fBFREEZE\&.indexed\fR will contain all changes which you\(cqve added to your index (like with \fIgit add\fR, \fIgit mv\fR, \fIgit rm\fR, etc\&.)\&. A commit with the message \fBFREEZE\&.unindexed\fR will contain all changes which were not in your index at the time you ran git freeze (freshly modified files, new files, etc\&.)\&.
.sp
By default git freeze will only freeze up to 100MB of untracked files\&. See \fICONFIGURATION VARIABLES\fR for more details\&.
By default \fBgit freeze\fR will only freeze up to 100MB of untracked files\&. See \fICONFIGURATION VARIABLES\fR for more details\&.
.SH "EXAMPLE"
.sp
......@@ -60,7 +60,7 @@ D deleted_file
\fB$ git freeze\fR
\fB$ git status \-\-short\fR
\fB$ git log \-n 2 \-\-stat\fR
commit d2b155e804b71d99ce51280d2fb9a56917351680
commit 288d7302bb306adec039d7ca24870d8d0ca14f36
Author: local <local@chromium\&.org>
Date: Thu Apr 10 08:54:56 2014 +0000
......@@ -72,7 +72,7 @@ Date: Thu Apr 10 08:54:56 2014 +0000
unstaged_deleted_file | 1 \-
4 files changed, 2 insertions(+), 1 deletion(\-)
commit bc45c733e95a18f2b2f641e31c7792441cb7da21
commit 9533cdaea75b6973d439f91b7f6007479db0f5a4
Author: local <local@chromium\&.org>
Date: Thu Apr 10 08:54:56 2014 +0000
......
man/man1/git-hyper-blame.1
View file @ 26adc2a9
'\" t
.\" Title: git-hyper-blame
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
.\" Date: 08/10/2020
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 07/01/2021
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 8c3f7227
.\" Source: depot_tools 906b5026
.\" Language: English
.\"
.TH "GIT\-HYPER\-BLAME" "1" "08/10/2020" "depot_tools 8c3f7227" "Chromium depot_tools Manual"
.TH "GIT\-HYPER\-BLAME" "1" "07/01/2021" "depot_tools 906b5026" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......@@ -38,13 +38,13 @@ git-hyper-blame \- Like git blame, but with the ability to ignore or bypass cert
.sp
.SH "DESCRIPTION"
.sp
git hyper\-blame is like git blame but it can ignore or "look through" a given set of commits, to find the real culprit\&.
\fBgit hyper\-blame\fR is like \fBgit blame\fR but it can ignore or "look through" a given set of commits, to find the real culprit\&.
.sp
This is useful if you have a commit that makes sweeping changes that are unlikely to be what you are looking for in a blame, such as mass reformatting or renaming\&. By adding these commits to the hyper\-blame ignore list, git hyper\-blame will look past these commits to find the previous commit that touched a given line\&.
This is useful if you have a commit that makes sweeping changes that are unlikely to be what you are looking for in a blame, such as mass reformatting or renaming\&. By adding these commits to the hyper\-blame ignore list, \fBgit hyper\-blame\fR will look past these commits to find the previous commit that touched a given line\&.
.sp
Follows the normal blame syntax: annotates <file> with the revision that last modified each line\&. Optional <rev> specifies the revision of <file> to start from\&.
Follows the normal \fBblame\fR syntax: annotates \fB<file>\fR with the revision that last modified each line\&. Optional \fB<rev>\fR specifies the revision of \fB<file>\fR to start from\&.
.sp
Automatically looks for a file called \&.git\-blame\-ignore\-revs in the repository root directory\&. This file has the same syntax as the \-\-ignore\-file argument, and any commits mentioned in this file are added to the ignore list\&.
Automatically looks for a file called \fB\&.git\-blame\-ignore\-revs\fR in the repository root directory\&. This file has the same syntax as the \fB\-\-ignore\-file\fR argument, and any commits mentioned in this file are added to the ignore list\&.
.SH "OPTIONS"
.PP
\-i <rev>
......@@ -55,18 +55,18 @@ A revision to ignore\&. Can be specified as many times as needed\&.
\-\-ignore\-file=<file>
.RS 4
A file containing a list of revisions to ignore\&. Can have comments beginning with
#\&.
\fB#\fR\&.
.RE
.PP
\-\-no\-default\-ignores
.RS 4
Do not ignore commits from the
\&.git\-blame\-ignore\-revs
\fB\&.git\-blame\-ignore\-revs\fR
file\&.
.RE
.SH "EXAMPLE"
.sp
Let\(cqs run git blame on a file:
Let\(cqs run \fBgit blame\fR on a file:
.sp
.sp
......@@ -87,7 +87,7 @@ c6eb3bfa (lorem 2014\-08\-11 23:15:57 +0000 5) NOSTRUD EXERCITATION UL
.\}
.sp
.sp
Notice that almost the entire file has been blamed on a formatting change? You aren\(cqt interested in the uppercasing of the file\&. You want to know who wrote/modified those lines in the first place\&. Just tell hyper\-blame to ignore that commit:
Notice that almost the entire file has been blamed on a formatting change? You aren\(cqt interested in the uppercasing of the file\&. You want to know who wrote/modified those lines in the first place\&. Just tell \fBhyper\-blame\fR to ignore that commit:
.sp
.sp
......@@ -108,12 +108,12 @@ c6eb3bfa (lorem 2014\-08\-11 23:15:57 +0000 5) NOSTRUD EXERCITATION ULLAMCO LAB
.\}
.sp
.sp
hyper\-blame places a * next to any line where it has skipped over an ignored commit, so you know that the line in question has been changed (by an ignored commit) since the given person wrote it\&.
\fBhyper\-blame\fR places a \fB*\fR next to any line where it has skipped over an ignored commit, so you know that the line in question has been changed (by an ignored commit) since the given person wrote it\&.
.SH "CAVEATS"
.sp
When a line skips over an ignored commit, a guess is made as to which commit previously modified that line, but it is not always clear where the line came from\&. If the ignored commit makes lots of changes in close proximity, in particular adding/removing/reordering lines, then the wrong authors may be blamed for nearby edits\&.
.sp
For this reason, hyper\-blame works best when the ignored commits are be limited to minor changes such as formatting and renaming, not refactoring or other more invasive changes\&.
For this reason, \fBhyper\-blame\fR works best when the ignored commits are be limited to minor changes such as formatting and renaming, not refactoring or other more invasive changes\&.
.SH "SEE ALSO"
.sp
\fBgit-blame\fR(1)
......
man/man1/git-map-branches.1
View file @ 26adc2a9
'\" t
.\" Title: git-map-branches
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
.\" Date: 08/10/2020
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 07/01/2021
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 8c3f7227
.\" Source: depot_tools 906b5026
.\" Language: English
.\"
.TH "GIT\-MAP\-BRANCHES" "1" "08/10/2020" "depot_tools 8c3f7227" "Chromium depot_tools Manual"
.TH "GIT\-MAP\-BRANCHES" "1" "07/01/2021" "depot_tools 906b5026" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......@@ -58,7 +58,7 @@ cyan\&.
.sp -1
.IP \(bu 2.3
.\}
The branch which will be modified with git\-commit is denoted with an asterisk (*) after the name\&.
The branch which will be modified with git\-commit is denoted with an asterisk (\fB*\fR) after the name\&.
.RE
.RE
.sp
......@@ -108,7 +108,7 @@ blue\&.
.sp -1
.IP \(bu 2.3
.\}
{NO UPSTREAM}
\fB{NO UPSTREAM}\fR
is a special placeholder in
magenta\&.
.sp
......@@ -152,7 +152,7 @@ Be more verbose\&. Pass once to show tracking info, twice for hash and review UR
.RE
.SH "EXAMPLE"
.sp
Given the hypothetical demo repo in \fBgit-map\fR(1)\*(Aqs EXAMPLE section, and assuming that the frozen_changes branch was currently checked out, running \fIgit map\-branches\fR would result in an output like:
Given the hypothetical demo repo in \fBgit-map\fR(1)\*(Aqs EXAMPLE section, and assuming that the \fBfrozen_changes\fR branch was currently checked out, running \fIgit map\-branches\fR would result in an output like:
.sp
.sp
......
man/man1/git-map.1
View file @ 26adc2a9
'\" t
.\" Title: git-map
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
.\" Date: 08/10/2020
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 07/01/2021
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 8c3f7227
.\" Source: depot_tools 906b5026
.\" Language: English
.\"
.TH "GIT\-MAP" "1" "08/10/2020" "depot_tools 8c3f7227" "Chromium depot_tools Manual"
.TH "GIT\-MAP" "1" "07/01/2021" "depot_tools 906b5026" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......@@ -37,7 +37,7 @@ git-map \- Display history of all branches in a colorized terminal format\&.
.sp
.SH "DESCRIPTION"
.sp
Git map formats the output of git log \-\-graph from all refs such that:
Git map formats the output of \fBgit log \-\-graph\fR from all refs such that:
.sp
.RS 4
.ie n \{\
......@@ -111,7 +111,7 @@ The currently checked out commit is highlighted with a
blue background\&.
.RE
.sp
The output is automatically piped through the less pager command, even on windows\&.
The output is automatically piped through the \fBless\fR pager command, even on windows\&.
.SH "OPTIONS"
.PP
<extra_args>\&...
......@@ -123,12 +123,12 @@ invocation\&. This can be used to restrict what refs
operates on, etc\&.
.sp
If you run git map with a series of fixed arguments frequently, you can use the depot\-tools\&.map\-extra configuration variable to pre\-set arguments (See
CONFIGURATION VARIABLES)
\fBCONFIGURATION VARIABLES\fR)
.RE
.SH "CONFIGURATION VARIABLES"
.SS "depot\-tools\&.map\-extra"
.sp
Each value of the \fIdepot\-tools\&.map\-extra\fR config variable is applied as an additional argument to git log during the execution of git map\&. If you wish to configure this, use git config \-\-add depot\-tools\&.map\-extra <value> to do so\&.
Each value of the \fIdepot\-tools\&.map\-extra\fR config variable is applied as an additional argument to \fBgit log\fR during the execution of git map\&. If you wish to configure this, use git \fBconfig \-\-add depot\-tools\&.map\-extra <value>\fR to do so\&.
.SH "EXAMPLE"
.sp
Running \fIgit map\fR would result in an output something like:
......@@ -138,26 +138,26 @@ Running \fIgit map\fR would result in an output something like:
.\}
.nf
\fB$ git map\fR
* \fBd0fb9c7 \fR (HEAD \-> frozen_branch) 2014\-04\-10 ~ FREEZE\&.unindexed
* \fBf48f415 \fR 2014\-04\-10 ~ modfile
* \fB4c5b9c0 \fR 2014\-04\-10 ~ a deleted file
* \fBf7ce1e4 \fR (\fBfixit\fR) 2014\-04\-10 ~ Add neat feature\fB <(frozen_branch)\fR
* \fB3726937 \fR 2014\-04\-10 ~ Epic README update
| * \fB14db2e5 \fR (\fBcool_feature\fR) 2014\-04\-10 ~ Respond to CL comments
| | * \fBee3f972 \fR (\fBsubfeature\fR) 2014\-04\-10 ~ integrate with CoolService
| | * \fB4f9f508 \fR 2014\-04\-10 ~ slick commenting action
* \fBd0fb9c7283\fR \fB(HEAD \-> frozen_branch\fR\fB) \fR2014\-04\-10 ~ FREEZE\&.unindexed
* \fBf48f415e0f\fR 2014\-04\-10 ~ modfile
* \fB4c5b9c0afd\fR 2014\-04\-10 ~ a deleted file
* \fBf7ce1e4b36\fR \fB(fixit\fR\fB) \fR2014\-04\-10 ~ Add neat feature
* \fB3726937ae6\fR 2014\-04\-10 ~ Epic README update
| * \fB14db2e5a60\fR \fB(cool_feature\fR\fB) \fR2014\-04\-10 ~ Respond to CL comments
| | * \fBee3f972810\fR \fB(subfeature\fR\fB) \fR2014\-04\-10 ~ integrate with CoolService
| | * \fB4f9f5082c8\fR 2014\-04\-10 ~ slick commenting action
| |/
| * \fB7d84f85 \fR 2014\-04\-10 ~ another improvement\fB <(subfeature)\fR
| * \fB27abea4 \fR (\fBspleen_tag\fR) 2014\-04\-10 ~ Refactor spleen
| * \fBd8abe73 \fR 2014\-04\-10 ~ Add widget
| * \fB7d84f8580a\fR 2014\-04\-10 ~ another improvement <(\fBsubfeature\fR)
| * \fB27abea4b40\fR \fB(spleen_tag\fR\fB) \fR2014\-04\-10 ~ Refactor spleen
| * \fBd8abe739e3\fR 2014\-04\-10 ~ Add widget
|/
* \fBbeec6f4 \fR (origin/main, origin/HEAD) 2014\-04\-10 ~ Make ReflectorImpl use mailboxes\fB <(cool_feature, fixit)\fR
* \fB41290e0 \fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds
* \fBa76fde7 \fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&.
* \fB9de7a71 \fR 2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&.
* \fB073b0c2 \fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewRenderView
* \fB2250f53 \fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path
* \fB33a7a74 \fR 2014\-04\-10 ~ Always output seccomp error messages to stderr
* \fBbeec6f4746\fR \fB(origin/main\fR\fB, origin/HEAD\fR\fB) \fR2014\-04\-10 ~ Make ReflectorImpl use mailboxes <(\fBfixit, cool_feature\fR)
* \fB41290e02b7\fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds
* \fBa76fde7b7b\fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&.
* \fB9de7a713b3\fR 2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&.
* \fB073b0c203a\fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewRenderView
* \fB2250f532d7\fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path
* \fB33a7a742b7\fR 2014\-04\-10 ~ Always output seccomp error messages to stderr
.fi
.if n \{\
.RE
......
man/man1/git-mark-merge-base.1
View file @ 26adc2a9
'\" t
.\" Title: git-mark-merge-base
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
.\" Date: 08/10/2020
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 07/01/2021
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 8c3f7227
.\" Source: depot_tools 906b5026
.\" Language: English
.\"
.TH "GIT\-MARK\-MERGE\-BA" "1" "08/10/2020" "depot_tools 8c3f7227" "Chromium depot_tools Manual"
.TH "GIT\-MARK\-MERGE\-BA" "1" "07/01/2021" "depot_tools 906b5026" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......@@ -39,11 +39,11 @@ git-mark-merge-base \- Manually interact with depot_tools\*(Aq merge\-base marke
.sp
.SH "DESCRIPTION"
.sp
Inspect, set or delete the current merge\-base marker for the current branch\&. This should not be needed, but is useful if things get into a snarled state\&. Pass no arguments to view the current value\&. If you provide <commit hash>, then git mark\-merge\-base will attempt to set that as the merge\-base value\&.
Inspect, set or delete the current merge\-base marker for the current branch\&. This should not be needed, but is useful if things get into a snarled state\&. Pass no arguments to view the current value\&. If you provide <commit hash>, then \fBgit mark\-merge\-base\fR will attempt to set that as the merge\-base value\&.
.sp
It is invalid to pick a commit which is not an ancestor of the current branch\&.
.sp
See \fBgit-rebase-update\fR(1)\*(Aqs description of the branch\&.<name>\&.base configuration variable for more info on what the merge base markers are for\&.
See \fBgit-rebase-update\fR(1)\*(Aqs description of the \fBbranch\&.<name>\&.base\fR configuration variable for more info on what the merge base markers are for\&.
.SH "OPTIONS"
.PP
\-d, \-\-delete
......
man/man1/git-nav-downstream.1
View file @ 26adc2a9
'\" t
.\" Title: git-nav-downstream
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
.\" Date: 08/10/2020
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 07/01/2021
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 8c3f7227
.\" Source: depot_tools 906b5026
.\" Language: English
.\"
.TH "GIT\-NAV\-DOWNSTREAM" "1" "08/10/2020" "depot_tools 8c3f7227" "Chromium depot_tools Manual"
.TH "GIT\-NAV\-DOWNSTREAM" "1" "07/01/2021" "depot_tools 906b5026" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......
man/man1/git-nav-upstream.1
View file @ 26adc2a9
'\" t
.\" Title: git-nav-upstream
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
.\" Date: 08/10/2020
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 07/01/2021
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 8c3f7227
.\" Source: depot_tools 906b5026
.\" Language: English
.\"
.TH "GIT\-NAV\-UPSTREAM" "1" "08/10/2020" "depot_tools 8c3f7227" "Chromium depot_tools Manual"
.TH "GIT\-NAV\-UPSTREAM" "1" "07/01/2021" "depot_tools 906b5026" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......
man/man1/git-new-branch.1
View file @ 26adc2a9
'\" t
.\" Title: git-new-branch
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
.\" Date: 08/10/2020
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 07/01/2021
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 8c3f7227
.\" Source: depot_tools 906b5026
.\" Language: English
.\"
.TH "GIT\-NEW\-BRANCH" "1" "08/10/2020" "depot_tools 8c3f7227" "Chromium depot_tools Manual"
.TH "GIT\-NEW\-BRANCH" "1" "07/01/2021" "depot_tools 906b5026" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......@@ -43,7 +43,7 @@ git-new-branch \- Create a new branch with correct tracking information\&.
.sp
Creates a new branch\&. By default the new branch will track the configured upstream for the repo (defaults to \fIorigin/main\fR)\&. If one of the other options is specified, it will track that other ref instead\&.
.sp
Conceptually, each branch in your repo represents one \fIChange List (CL)\fR\&. If you have many independent CLs (i\&.e\&. the changes in one do not interact with/depend on the changes in another), then you should create them as new branches tracking the default upstream (i\&.e\&. git new\-branch <branch_name>)\&. If you have features which depend on each other, you should create stacked branches using git new\-branch \-\-upstream_current <branch_name>\&.
Conceptually, each branch in your repo represents one \fIChange List (CL)\fR\&. If you have many independent CLs (i\&.e\&. the changes in one do not interact with/depend on the changes in another), then you should create them as new branches tracking the default upstream (i\&.e\&. \fBgit new\-branch <branch_name>\fR)\&. If you have features which depend on each other, you should create stacked branches using \fBgit new\-branch \-\-upstream_current <branch_name>\fR\&.
.SH "OPTIONS"
.PP
\-\-upstream_current
......@@ -59,18 +59,23 @@ Set the tracking (upstream) branch to <REF>\&. <REF> may be a local branch, remo
\-\-lkgr
.RS 4
Alias for
\-\-upstream lkgr\&.
\fB\-\-upstream lkgr\fR\&.
.RE
.PP
\-\-inject_current
.RS 4
Set the tracking (upstream) branch of the newly\-created branch to the tracking (upstream) branch of the currently\-checked\-out branch and set the tracking (upstream) branch of the currently\-checked\-out branch to the newly\-created branch\&.
.RE
.sp
.if n \{\
.RS 4
.\}
.nf
Before: current > upstream
.RE
.RS 4
After: current > new > upstream
.fi
.if n \{\
.RE
.\}
.RE
.PP
<branch_name>
......@@ -91,35 +96,35 @@ This configures the default \fIupstream\fR for all new branches\&. If it is unse
.nf
\fB$ git map\-branches \-v\fR
origin/main
cool_feature [ ahead 4 ]
subfeature [ ahead 2 | behind 1 ]
fixit [ ahead 2 ]
\fB frozen_branch * [ ahead 3 ]
cool_feature [ 4 commits ]
subfeature [ 2 commits | behind 1 ]
fixit [ 2 commits ]
\fB frozen_branch * [ 3 commits ]
$ git new\-branch independent_cl\fR
\fB$ git map\-branches \-v\fR
\fBorigin/main
\fR cool_feature [ ahead 4 ]
subfeature [ ahead 2 | behind 1 ]
fixit [ ahead 2 ]
frozen_branch [ ahead 3 ]
\fR cool_feature [ 4 commits ]
subfeature [ 2 commits | behind 1 ]
fixit [ 2 commits ]
frozen_branch [ 3 commits ]
\fB independent_cl *
$ vi foo && git add \-A && git commit \-m foo\fR
\fB$ git map\-branches \-v\fR
origin/main
cool_feature [ ahead 4 ]
subfeature [ ahead 2 | behind 1 ]
fixit [ ahead 2 ]
frozen_branch [ ahead 3 ]
\fB independent_cl * [ ahead 1 ]
cool_feature [ 4 commits ]
subfeature [ 2 commits | behind 1 ]
fixit [ 2 commits ]
frozen_branch [ 3 commits ]
\fB independent_cl * [ 1 commit ]
$ git new\-branch \-\-upstream subfeature nested_cl\fR
\fB$ git map\-branches \-v\fR
origin/main
cool_feature [ ahead 4 ]
\fB subfeature [ ahead 2 | behind 1 ] \fR\fB\fB(1)\fR\fR\fB
cool_feature [ 4 commits ]
\fB subfeature [ 2 commits | behind 1 ] \fR\fB\fB(1)\fR\fR\fB
nested_cl *
\fR fixit [ ahead 2 ]
frozen_branch [ ahead 3 ]
independent_cl [ ahead 1 ]
\fR fixit [ 2 commits ]
frozen_branch [ 3 commits ]
independent_cl [ 1 commit ]
\fB$ git checkout cool_feature\fR
Switched to branch \*(Aqcool_feature\*(Aq
Your branch is ahead of \*(Aqorigin/main\*(Aq by 4 commits\&.
......@@ -127,29 +132,28 @@ Your branch is ahead of \*(Aqorigin/main\*(Aq by 4 commits\&.
\fB$ git new\-branch \-\-upstream_current cl_depends_on_cool_feature\fR
\fB$ git map\-branches \-v\fR
origin/main
\fB cool_feature [ ahead 4 ]
\fB cool_feature [ 4 commits ]
cl_depends_on_cool_feature *
\fR subfeature [ ahead 2 | behind 1 ]
\fR subfeature [ 2 commits | behind 1 ]
nested_cl
fixit [ ahead 2 ]
frozen_branch [ ahead 3 ]
independent_cl [ ahead 1 ]
fixit [ 2 commits ]
frozen_branch [ 3 commits ]
independent_cl [ 1 commit ]
\fB$ git checkout subfeature\fR
Switched to branch \*(Aqsubfeature\*(Aq
Your branch and \*(Aqcool_feature\*(Aq have diverged,
and have 2 and 1 different commits each, respectively\&.
(use "git pull" to merge the remote branch into yours)
\fB$ git new\-branch \-\-inject_current injected_cl\fR
\fB$ git map\-branches \-v\fR
origin/main
\fB cool_feature [ ahead 4 ] \fR\fB\fB(1)\fR\fR\fB
\fB cool_feature [ 4 commits ]
cl_depends_on_cool_feature
injected_cl *
\fR subfeature [ ahead 2 | behind 1 ]
\fR subfeature [ 2 commits | behind 1 ]
nested_cl
fixit [ ahead 2 ]
frozen_branch [ ahead 3 ]
independent_cl [ ahead 1 ]
fixit [ 2 commits ]
frozen_branch [ 3 commits ]
independent_cl [ 1 commit ]
.fi
.if n \{\
.RE
......
man/man1/git-rebase-update.1
View file @ 26adc2a9
'\" t
.\" Title: git-rebase-update
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
.\" Date: 08/10/2020
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 07/01/2021
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 8c3f7227
.\" Source: depot_tools 906b5026
.\" Language: English
.\"
.TH "GIT\-REBASE\-UPDATE" "1" "08/10/2020" "depot_tools 8c3f7227" "Chromium depot_tools Manual"
.TH "GIT\-REBASE\-UPDATE" "1" "07/01/2021" "depot_tools 906b5026" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......@@ -50,7 +50,7 @@ for more detail)\&. Additionally, the current branch is recorded for the
phase later (see
\fICONFIGURATION VARIABLES\fR
for details on
depot\-tools\&.rebase\-update\&.starting\-branch)\&.
\fBdepot\-tools\&.rebase\-update\&.starting\-branch\fR)\&.
.RE
.PP
Fetching
......@@ -58,7 +58,7 @@ Fetching
All branches are examined to find their upstream references\&. The correct set of git remotes is determined, and fetched accordingly\&. Note that if any branches have a tag as their upstream, we are forced to pull all remotes\&.
.sp
Pass
\-\-no\-fetch
\fB\-\-no\-fetch\fR
to skip this phase\&.
.RE
.PP
......@@ -78,13 +78,13 @@ cause for conflicts is when your branch has been committed to the upstream in sq
and the
\fICommit Queue\fR
will do\&. Because of that,
git rebase\-update
\fBgit rebase\-update\fR
will attempt to squash your conflicted branch to see if the squashed version applies cleanly to its upstream\&.
.sp
If it does not apply cleanly, then your original (non\-squashed) branch will be left in mid\-rebase and
git rebase\-update
\fBgit rebase\-update\fR
will exit\&. You can deal with this like any other conflicted rebase\&. When you\(cqre done, just
git rebase\-update
\fBgit rebase\-update\fR
again to pick up where you left off\&.
.RE
.sp
......@@ -98,17 +98,17 @@ Once all the branches have been rebased, any empty branches (i\&.e\&. branches w
.PP
Restoration
.RS 4
git rebase\-update
\fBgit rebase\-update\fR
checks out the branch that you started on, and
\fIthaws\fR
it, if necessary (see
\fBgit-thaw\fR(1))\&. If the branch you started on got cleaned up,
git rebase\-update
\fBgit rebase\-update\fR
will checkout the
\fIroot\fR
ref (defaults to
\fIorigin\fR\*(Aqs default branch, as configured by
depot\-tools\&.upstream, see
\fBdepot\-tools\&.upstream\fR, see
\fBgit-new-branch\fR(1))\&.
.RE
.SH "OPTIONS"
......@@ -121,7 +121,7 @@ Keep processing past failed rebases\&.
\-n, \-\-no\-fetch
.RS 4
Skip the
git fetch
\fBgit fetch\fR
phase of rebase\-update\&.
.RE
.PP
......@@ -137,13 +137,13 @@ Only rebase the current branch\&.
.SH "CONFIGURATION VARIABLES"
.SS "depot\-tools\&.rebase\-update\&.starting\-branch"
.sp
When git rebase\-update first runs, it will record the current branch here so that when it completes successfully, it will return back to the same branch you started on, even if git rebase\-update is interrupted due to rebase conflicts\&. When git rebase\-update completes successfully, this configuration variable is removed\&.
When \fBgit rebase\-update\fR first runs, it will record the current branch here so that when it completes successfully, it will return back to the same branch you started on, even if \fBgit rebase\-update\fR is interrupted due to rebase conflicts\&. When \fBgit rebase\-update\fR completes successfully, this configuration variable is removed\&.
.SS "branch\&.<name>\&.dormant"
.sp
If true, will cause rebase\-update to skip all processing on the branch\&. Useful for old/high\-conflict branches which you want to keep for posterity, but don\(cqt want to deal with when running git rebase\-update
If \fBtrue\fR, will cause rebase\-update to skip all processing on the branch\&. Useful for old/high\-conflict branches which you want to keep for posterity, but don\(cqt want to deal with when running \fBgit rebase\-update\fR
.SS "branch\&.<name>\&.base"
.sp
Holds the \fIbase\fR reference for this branch\&. By default this is equivalent to git merge\-base <name> <name>@{upstream}\&. However, it can diverge if <name>@{upstream} is manually rebased\&. In this case, it correctly preserves the value it had before, where git merge\-base would now report the wrong value\&.
Holds the \fIbase\fR reference for this branch\&. By default this is equivalent to \fBgit merge\-base <name> <name>@{upstream}\fR\&. However, it can diverge if \fB<name>@{upstream}\fR is manually rebased\&. In this case, it correctly preserves the value it had before, where \fBgit merge\-base\fR would now report the wrong value\&.
.sp
All of the tools in the \fBdepot_tools\fR(1) suite collude to keep this value as up\-to\-date as possible, including \fBgit-reparent-branch\fR(1), and \fBgit-new-branch\fR(1)\&. \fBgit-map\fR(1) also shows the location of these marker values in \fBwhite\fR\&.
.sp
......
man/man1/git-rename-branch.1
View file @ 26adc2a9
'\" t
.\" Title: git-rename-branch
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
.\" Date: 08/10/2020
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 07/01/2021
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 8c3f7227
.\" Source: depot_tools 906b5026
.\" Language: English
.\"
.TH "GIT\-RENAME\-BRANCH" "1" "08/10/2020" "depot_tools 8c3f7227" "Chromium depot_tools Manual"
.TH "GIT\-RENAME\-BRANCH" "1" "07/01/2021" "depot_tools 906b5026" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......
man/man1/git-reparent-branch.1
View file @ 26adc2a9
'\" t
.\" Title: git-reparent-branch
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
.\" Date: 08/10/2020
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 07/01/2021
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 8c3f7227
.\" Source: depot_tools 906b5026
.\" Language: English
.\"
.TH "GIT\-REPARENT\-BRANC" "1" "08/10/2020" "depot_tools 8c3f7227" "Chromium depot_tools Manual"
.TH "GIT\-REPARENT\-BRANC" "1" "07/01/2021" "depot_tools 906b5026" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......@@ -41,7 +41,7 @@ git-reparent-branch \- Alter the parentage (upstream) for the current branch\&.
.sp
Change the \fIupstream\fR of the current branch, and then run \fBgit-rebase-update\fR(1) to move the commits in the current branch, as well as the commits in all descendant branches, onto the new parent\&.
.sp
<new_parent> may be either a local branch, remote branch, OR a tag (such as lkgr)\&.
\fB<new_parent>\fR may be either a local branch, remote branch, OR a tag (such as \fBlkgr\fR)\&.
.sp
This is particularly useful to reparent an independent CL to become dependent on another CL, or vice versa\&. This could happen if you started both on the assumption that they were independent, but later realized that this was not the case\&.
.SH "OPTIONS"
......
man/man1/git-retry.1
View file @ 26adc2a9
'\" t
.\" Title: git-retry
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
.\" Date: 08/10/2020
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 07/01/2021
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 8c3f7227
.\" Source: depot_tools 906b5026
.\" Language: English
.\"
.TH "GIT\-RETRY" "1" "08/10/2020" "depot_tools 8c3f7227" "Chromium depot_tools Manual"
.TH "GIT\-RETRY" "1" "07/01/2021" "depot_tools 906b5026" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......@@ -37,28 +37,28 @@ git-retry \- Bootstrap function to retry a git command\&.
.sp
.SH "DESCRIPTION"
.sp
git retry is a bootstrap that wraps a standard git command execution in a fault\-tolerant retry wrapper\&.
\fBgit retry\fR is a bootstrap that wraps a standard \fBgit\fR command execution in a fault\-tolerant retry wrapper\&.
.sp
If a retry succeeds, the return code of the successful attempt is returned\&. Otherwise, the return code of the last failed attempt is returned\&.
.sp
The wrapper is aware of git\-specific failure conditions and will only consider retrying if a given failure can be linked to such a condition\&.
The wrapper is aware of \fBgit\fR\-specific failure conditions and will only consider retrying if a given failure can be linked to such a condition\&.
.SH "OPTIONS"
.PP
<git_subcommand>
.RS 4
The
git
\fBgit\fR
command to retry\&. This should omit the actual
git
\fBgit\fR
command (e\&.g\&., to retry
git clone, use
git retry clone)\&.
\fBgit clone\fR, use
\fBgit retry clone\fR)\&.
.RE
.PP
\-v, \-\-verbose
.RS 4
Increases logging verbosity\&. By default, no additional logging is generated by the
git retry
\fBgit retry\fR
command\&. This can be specified multiple times\&.
.RE
.PP
......@@ -96,7 +96,7 @@ The exponential factor to apply to the delay\&. By default this is
.RE
.SH "EXIT STATUS"
.sp
Upon success, git retry will exit with the successful exit code of \fB0\fR\&. On failure, it will exit with the exit code of the last failed attempt\&.
Upon success, \fBgit retry\fR will exit with the successful exit code of \fB0\fR\&. On failure, it will exit with the exit code of the last failed attempt\&.
.SH "CHROMIUM DEPOT_TOOLS"
.sp
Part of the chromium \fBdepot_tools\fR(7) suite\&. These tools are meant to assist with the development of chromium and related projects\&. Download the tools by checking out the \m[blue]\fBgit repository\fR\m[]\&\s-2\u[1]\d\s+2\&.
......
man/man1/git-squash-branch.1
View file @ 26adc2a9
'\" t
.\" Title: git-squash-branch
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
.\" Date: 08/10/2020
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 07/01/2021
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 8c3f7227
.\" Source: depot_tools 906b5026
.\" Language: English
.\"
.TH "GIT\-SQUASH\-BRANCH" "1" "08/10/2020" "depot_tools 8c3f7227" "Chromium depot_tools Manual"
.TH "GIT\-SQUASH\-BRANCH" "1" "07/01/2021" "depot_tools 906b5026" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......@@ -37,9 +37,9 @@ git-squash-branch \- Takes all commits in a single branch and replaces them with
.sp
.SH "DESCRIPTION"
.sp
git squash\-branch is a simple helper command\&. It takes all the commits on the current branch from the \fImerge_base\fR to HEAD, and reduces them to a single commit\&. The new commit will contain a summary of all the commits which were squashed, preceded by a header message indicating that it\(cqs the result of a squash (or the message you pass on the command line\&.)\&.
\fBgit squash\-branch\fR is a simple helper command\&. It takes all the commits on the current branch from the \fImerge_base\fR to HEAD, and reduces them to a single commit\&. The new commit will contain a summary of all the commits which were squashed, preceded by a header message indicating that it\(cqs the result of a squash (or the message you pass on the command line\&.)\&.
.sp
Squashing branches is useful when trying to rebase\-update over branches which were pushed to their upstream (or committed by the \fICommit Queue\fR), and then conflicting changes landed in upstream on top of the push/commit\&. If you know that your branch was committed but \fBgit-rebase-update\fR(1) isn\(cqt able to automatically clean it, you can squash the troublesome branch before git rebase\-update, and then when git rebase\-update presents the conflict, you can verify that the conflict diff is what you expected (and then skip it with git rebase \-\-skip)\&.
Squashing branches is useful when trying to rebase\-update over branches which were pushed to their upstream (or committed by the \fICommit Queue\fR), and then conflicting changes landed in upstream on top of the push/commit\&. If you know that your branch was committed but \fBgit-rebase-update\fR(1) isn\(cqt able to automatically clean it, you can squash the troublesome branch before \fBgit rebase\-update\fR, and then when \fBgit rebase\-update\fR presents the conflict, you can verify that the conflict diff is what you expected (and then skip it with \fBgit rebase \-\-skip\fR)\&.
.SH "OPTIONS"
.PP
\-m <message>, \-\-message=<message>
......@@ -55,46 +55,47 @@ Optional message to use for the first line of the squashed commit\&. If omitted,
.\}
.nf
\fB$ git map\fR
* \fBd0fb9c7 \fR (HEAD \-> frozen_branch) 2014\-04\-10 ~ FREEZE\&.unindexed
* \fBf48f415 \fR 2014\-04\-10 ~ modfile
* \fB4c5b9c0 \fR 2014\-04\-10 ~ a deleted file
* \fBf7ce1e4 \fR (\fBfixit\fR) 2014\-04\-10 ~ Add neat feature\fB <(frozen_branch)\fR
* \fB3726937 \fR 2014\-04\-10 ~ Epic README update
| * \fB14db2e5 \fR (\fBcool_feature\fR) 2014\-04\-10 ~ Respond to CL comments
| | * \fBee3f972 \fR (\fBsubfeature\fR) 2014\-04\-10 ~ integrate with CoolService
| | * \fB4f9f508 \fR 2014\-04\-10 ~ slick commenting action
* \fBd0fb9c7283\fR \fB(HEAD \-> frozen_branch\fR\fB) \fR2014\-04\-10 ~ FREEZE\&.unindexed
* \fBf48f415e0f\fR 2014\-04\-10 ~ modfile
* \fB4c5b9c0afd\fR 2014\-04\-10 ~ a deleted file
* \fBf7ce1e4b36\fR \fB(fixit\fR\fB) \fR2014\-04\-10 ~ Add neat feature
* \fB3726937ae6\fR 2014\-04\-10 ~ Epic README update
| * \fB14db2e5a60\fR \fB(cool_feature\fR\fB) \fR2014\-04\-10 ~ Respond to CL comments
| | * \fBee3f972810\fR \fB(subfeature\fR\fB) \fR2014\-04\-10 ~ integrate with CoolService
| | * \fB4f9f5082c8\fR 2014\-04\-10 ~ slick commenting action
| |/
| * \fB7d84f85 \fR 2014\-04\-10 ~ another improvement\fB <(subfeature)\fR
| * \fB27abea4 \fR (\fBspleen_tag\fR) 2014\-04\-10 ~ Refactor spleen
| * \fBd8abe73 \fR 2014\-04\-10 ~ Add widget
| * \fB7d84f8580a\fR 2014\-04\-10 ~ another improvement <(\fBsubfeature\fR)
| * \fB27abea4b40\fR \fB(spleen_tag\fR\fB) \fR2014\-04\-10 ~ Refactor spleen
| * \fBd8abe739e3\fR 2014\-04\-10 ~ Add widget
|/
* \fBbeec6f4 \fR (origin/main, origin/HEAD) 2014\-04\-10 ~ Make ReflectorImpl use mailboxes\fB <(cool_feature, fixit)\fR
* \fB41290e0 \fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds
* \fBa76fde7 \fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&.
* \fB9de7a71 \fR 2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&.
* \fB073b0c2 \fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewRenderView
* \fB2250f53 \fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path
* \fB33a7a74 \fR 2014\-04\-10 ~ Always output seccomp error messages to stderr
* \fBbeec6f4746\fR \fB(origin/main\fR\fB, origin/HEAD\fR\fB) \fR2014\-04\-10 ~ Make ReflectorImpl use mailboxes <(\fBcool_feature, fixit\fR)
* \fB41290e02b7\fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds
* \fBa76fde7b7b\fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&.
* \fB9de7a713b3\fR 2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&.
* \fB073b0c203a\fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewRenderView
* \fB2250f532d7\fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path
* \fB33a7a742b7\fR 2014\-04\-10 ~ Always output seccomp error messages to stderr
\fB$ git squash\-branch \-m \*(Aqcool squash demo\*(Aq\fR
\fB$ git map\fR
* \fB98e69e8 \fR (HEAD \-> frozen_branch) 2014\-04\-10 ~ cool squash demo
* \fBf7ce1e4 \fR (\fBfixit\fR) 2014\-04\-10 ~ Add neat feature\fB <(frozen_branch)\fR
* \fB3726937 \fR 2014\-04\-10 ~ Epic README update
| * \fB14db2e5 \fR (\fBcool_feature\fR) 2014\-04\-10 ~ Respond to CL comments
| | * \fBee3f972 \fR (\fBsubfeature\fR) 2014\-04\-10 ~ integrate with CoolService
| | * \fB4f9f508 \fR 2014\-04\-10 ~ slick commenting action
* \fB98e69e80b9\fR \fB(HEAD \-> frozen_branch\fR\fB) \fR2014\-04\-10 ~ cool squash demo
* \fBf7ce1e4b36\fR \fB(fixit\fR\fB) \fR2014\-04\-10 ~ Add neat feature
* \fB3726937ae6\fR 2014\-04\-10 ~ Epic README update
| * \fB14db2e5a60\fR \fB(cool_feature\fR\fB) \fR2014\-04\-10 ~ Respond to CL comments
| | * \fBee3f972810\fR \fB(subfeature\fR\fB) \fR2014\-04\-10 ~ integrate with CoolService
| | * \fB4f9f5082c8\fR 2014\-04\-10 ~ slick commenting action
| |/
| * \fB7d84f85 \fR 2014\-04\-10 ~ another improvement\fB <(subfeature)\fR
| * \fB27abea4 \fR (\fBspleen_tag\fR) 2014\-04\-10 ~ Refactor spleen
| * \fBd8abe73 \fR 2014\-04\-10 ~ Add widget
| * \fB7d84f8580a\fR 2014\-04\-10 ~ another improvement <(\fBsubfeature\fR)
| * \fB27abea4b40\fR \fB(spleen_tag\fR\fB) \fR2014\-04\-10 ~ Refactor spleen
| * \fBd8abe739e3\fR 2014\-04\-10 ~ Add widget
|/
* \fBbeec6f4 \fR (origin/main, origin/HEAD) 2014\-04\-10 ~ Make ReflectorImpl use mailboxes\fB <(cool_feature, fixit)\fR
* \fB41290e0 \fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds
* \fBa76fde7 \fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&.
* \fB9de7a71 \fR 2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&.
* \fB073b0c2 \fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewRenderView
* \fB2250f53 \fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path
* \fB33a7a74 \fR 2014\-04\-10 ~ Always output seccomp error messages to stderr
* \fBbeec6f4746\fR \fB(origin/main\fR\fB, origin/HEAD\fR\fB) \fR2014\-04\-10 ~ Make ReflectorImpl use mailboxes <(\fBfixit, cool_feature\fR)
* \fB41290e02b7\fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds
* \fBa76fde7b7b\fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&.
* \fB9de7a713b3\fR 2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&.
* \fB073b0c203a\fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewRenderView
* \fB2250f532d7\fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path
* \fB33a7a742b7\fR 2014\-04\-10 ~ Always output seccomp error messages to stderr
.fi
.if n \{\
.RE
......
man/man1/git-thaw.1
View file @ 26adc2a9
'\" t
.\" Title: git-thaw
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
.\" Date: 08/10/2020
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 07/01/2021
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 8c3f7227
.\" Source: depot_tools 906b5026
.\" Language: English
.\"
.TH "GIT\-THAW" "1" "08/10/2020" "depot_tools 8c3f7227" "Chromium depot_tools Manual"
.TH "GIT\-THAW" "1" "07/01/2021" "depot_tools 906b5026" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......@@ -37,9 +37,9 @@ git-thaw \- Un\-freeze all changes on a frozen branch\&.
.sp
.SH "DESCRIPTION"
.sp
git thaw takes a frozen branch (as made by \fBgit-freeze\fR(1)), and returns it to the status that it was in before it was frozen\&.
\fBgit thaw\fR takes a frozen branch (as made by \fBgit-freeze\fR(1)), and returns it to the status that it was in before it was frozen\&.
.sp
If you freeze a branch multiple times (i\&.e\&. change files, freeze, change files, freeze), git thaw will thaw all of the freezes\&.
If you freeze a branch multiple times (i\&.e\&. change files, freeze, change files, freeze), \fBgit thaw\fR will thaw all of the freezes\&.
.SH "SEE ALSO"
.sp
\fBgit-freeze\fR(1)
......
man/man1/git-upstream-diff.1
View file @ 26adc2a9
'\" t
.\" Title: git-upstream-diff
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
.\" Date: 08/10/2020
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 07/01/2021
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 8c3f7227
.\" Source: depot_tools 906b5026
.\" Language: English
.\"
.TH "GIT\-UPSTREAM\-DIFF" "1" "08/10/2020" "depot_tools 8c3f7227" "Chromium depot_tools Manual"
.TH "GIT\-UPSTREAM\-DIFF" "1" "07/01/2021" "depot_tools 906b5026" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......@@ -50,18 +50,18 @@ git diff \-\-patience \-C \-C branch@{upstream} \fB(1)\fR \fB(2)\fR
.\}
.sp
.sp
\fB1. \fR\-C \-C
\fB1. \fR\fB\-C \-C\fR
detects file copies/renames
.br
\fB2. \fR\-\-patience
\fB2. \fR\fB\-\-patience\fR
uses the patience\-diff algorithm, which tends to produce nicer diffs in many cases\&.
.br
.sp
The difference is that branch@{upstream} is actually the tagged merge base of your branch (See \fBgit-rebase-update\fR(1))\&. This means that if your upstream branch was rebased, but you haven\(cqt yet rebased the current branch on top of it, you\(cqll still see an accurate diff compared to just diffing against @{upstream}\&.
The difference is that \fBbranch@{upstream}\fR is actually the tagged merge base of your branch (See \fBgit-rebase-update\fR(1))\&. This means that if your upstream branch was rebased, but you haven\(cqt yet rebased the current branch on top of it, you\(cqll still see an accurate diff compared to just diffing against \fB@{upstream}\fR\&.
.sp
The \-\-wordwise option also allows git\-diff to do word\-by\-word comparison in a semi\-intelligent way\&. However, sometimes it can produce surprising results, so it is disabled by default\&.
The \fB\-\-wordwise\fR option also allows \fBgit\-diff\fR to do word\-by\-word comparison in a semi\-intelligent way\&. However, sometimes it can produce surprising results, so it is disabled by default\&.
.sp
Since any additional options are passed through to git\-diff unchanged, you can use this as a general replacement for git diff for things like:
Since any additional options are passed through to git\-diff unchanged, you can use this as a general replacement for \fBgit diff\fR for things like:
.sp
.if n \{\
.RS 4
......@@ -97,25 +97,25 @@ Show a diff between the specified branch and its upstream, instead of using the
.RS 4
Extra arguments are included in the invocation of
\fBgit-diff\fR(1)\&. These can be anything that
git\-diff
\fBgit\-diff\fR
normally takes\&.
.PP
\-\-stat
\fB\-\-stat\fR
.RS 4
This is particularly useful to show
\fIwhich\fR
files have been changed in comparison to the upstream branch\&.
.RE
.PP
\-\-staged
\fB\-\-staged\fR
.RS 4
Diff against the staged (cached) changes, instead of against the working directory\&. This is
\fIsubstantially\fR
faster on large repos, but doesn\(cqt take into account unstaged changes (i\&.e\&. changes in your working copy which you haven\(cqt staged with
git add)\&.
\fBgit add\fR)\&.
.RE
.PP
\-\- <filename patterns>*
\fB\-\- <filename patterns>*\fR
.RS 4
Restrict the diff to only show the diff for given files compared to the upstream\&.
.RE
......@@ -123,7 +123,7 @@ Restrict the diff to only show the diff for given files compared to the upstream
.SH "CONFIGURATION VARIABLES"
.SS "depot\-tools\&.upstream\-diff\&.default\-args"
.sp
A list\-configuration variable\&. Each instance of this config variable will be prepended to all invocations of git upstream\-diff, as if you had passed them on the command line\&.
A list\-configuration variable\&. Each instance of this config variable will be prepended to all invocations of \fBgit upstream\-diff\fR, as if you had passed them on the command line\&.
.SH "SUGGESTED ALIASES"
.sp
Some common short\-hand aliases\&. Feel free to add these to your \fI~/\&.gitconfig\fR file\&.
......
man/man7/depot_tools.7
View file @ 26adc2a9
'\" t
.\" Title: depot_tools
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
.\" Date: 08/10/2020
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 07/01/2021
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 8c3f7227
.\" Source: depot_tools 906b5026
.\" Language: English
.\"
.TH "DEPOT_TOOLS" "7" "08/10/2020" "depot_tools 8c3f7227" "Chromium depot_tools Manual"
.TH "DEPOT_TOOLS" "7" "07/01/2021" "depot_tools 906b5026" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......
man/man7/depot_tools_tutorial.7
View file @ 26adc2a9
'\" t
.\" Title: depot_tools_tutorial
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
.\" Date: 08/10/2020
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 07/01/2021
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 8c3f7227
.\" Source: depot_tools 696f1e12
.\" Language: English
.\"
.TH "DEPOT_TOOLS_TUTORIAL" "7" "08/10/2020" "depot_tools 8c3f7227" "Chromium depot_tools Manual"
.TH "DEPOT_TOOLS_TUTORIAL" "7" "07/01/2021" "depot_tools 696f1e12" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......@@ -121,7 +121,7 @@ Managing dependent CLs
Example Walkthrough
.RE
.sp
Please refer to the manpages (or \-\-help output) for details about any of the commands mentioned in this tutorial\&.
Please refer to the manpages (or \fB\-\-help\fR output) for details about any of the commands mentioned in this tutorial\&.
.if n \{\
.sp
.\}
......@@ -135,7 +135,7 @@ Please refer to the manpages (or \-\-help output) for details about any of the c
.ps -1
.br
.sp
If your platform does not support manpages (or you prefer something a bit more expressive than plain text) you can find all documentation in \fIhtml\fR form in the [DEPOT_TOOLS]/man/html folder\&.
If your platform does not support manpages (or you prefer something a bit more expressive than plain text) you can find all documentation in \fIhtml\fR form in the \fB[DEPOT_TOOLS]/man/html\fR folder\&.
.sp .5v
.RE
.SS "PREREQUISITES"
......@@ -197,13 +197,13 @@ If you\(cqve tried these out and are still having some trouble getting started,
Litmus Test
.RS 4
If you know what
git add,
git status,
git commit
\fBgit add\fR,
\fBgit status\fR,
\fBgit commit\fR
do and you know
\fIessentially\fR
what
git rebase
\fBgit rebase\fR
does, then you should know enough to follow along\&.
.RE
.SH "SETTING UP"
......@@ -222,7 +222,7 @@ Clone the \fIdepot_tools\fR repository:
.\}
.sp
.sp
Add \fIdepot_tools\fR to the \fIfront\fR of your PATH (you will probably want to put this in your ~/\&.bashrc or ~/\&.zshrc)\&. Assuming you cloned \fIdepot_tools\fR to /path/to/depot_tools:
Add \fIdepot_tools\fR to the \fIfront\fR of your PATH (you will probably want to put this in your \fB~/\&.bashrc\fR or \fB~/\&.zshrc\fR)\&. Assuming you cloned \fIdepot_tools\fR to \fB/path/to/depot_tools\fR:
.sp
.if n \{\
.RS 4
......@@ -297,7 +297,7 @@ Pick an empty directory and run one of the following:
.\}
.sp
.sp
When the fetch tool completes you should have the following in your working directory:
When the \fBfetch\fR tool completes you should have the following in your working directory:
.sp
.if n \{\
.RS 4
......@@ -352,7 +352,7 @@ This will pull all dependencies of the Chromium src checkout\&. You will need to
.ps -1
.br
.sp
The remainder of the tutorial assumes that your current working directory is the src/ folder mentioned in Getting the code\&.
The remainder of the tutorial assumes that your current working directory is the \fBsrc/\fR folder mentioned in Getting the code\&.
.sp .5v
.RE
.sp
......@@ -369,7 +369,7 @@ Each CL corresponds exactly with a single branch in git\&. Any time you want to
.\}
.sp
.sp
This will create and checkout a new branch named branch_name which will track the default upstream branch (origin/main)\&. See \fBgit-new-branch\fR(1) for more features\&.
This will create and checkout a new branch named \fBbranch_name\fR which will track the default upstream branch (\fBorigin/main\fR)\&. See \fBgit-new-branch\fR(1) for more features\&.
.sp
Commit as many changes as you like to this branch\&. When you want to upload it for review, run:
.sp
......@@ -402,11 +402,11 @@ Inevitably, you\(cqll want to pull in changes from the main Chromium repo\&. Thi
.sp
This command will update all of your CLs to contain the latest code from their upstreams\&. It will also automatically clean up CLs which have been committed and a couple other nice things\&. See \fBgit-rebase-update\fR(1) for the full scoop\&.
.sp
One thing to look out for are \fImerge conflicts\fR\&. These happen for exactly the same as they do with SVN, but the experience is a little more controllable with git\&. git rebase\-update will try to rebase all your branches for you, but if it encounters a merge conflict in one, it will halt and leave you in a rebase conflict state (see \fBgit-rebase\fR(1))\&. Resolving git rebase merge conflicts is beyond the scope of this tutorial, but there are many good sources online (see the Prerequisites for some)\&.
One thing to look out for are \fImerge conflicts\fR\&. These happen for exactly the same as they do with SVN, but the experience is a little more controllable with git\&. \fBgit rebase\-update\fR will try to rebase all your branches for you, but if it encounters a merge conflict in one, it will halt and leave you in a rebase conflict state (see \fBgit-rebase\fR(1))\&. Resolving \fBgit rebase\fR merge conflicts is beyond the scope of this tutorial, but there are many good sources online (see the Prerequisites for some)\&.
.sp
Sometimes you\(cqre pretty certain that you\(cqve committed a certain branch, but git rebase\-update isn\(cqt able to tell that for sure\&. This is usually because your branch doesn\(cqt rebase cleanly\&. You could just delete the branch with git branch \-D <branch>, but you\(cqd like to double check the diff of your branch against its upstream before deleting it\&. If this is the case you can abort the rebase started by git rebase\-update, and then run \fBgit-squash-branch\fR(1) to flatten your branch into a single commit\&. When you run git rebase\-update again, you\(cqll get a (hopefully) much smaller / saner diff\&. If it turns out you were wrong about your branch being fully committed, you can use \fBgit-reflog\fR(1) to reset your branch back to where it was before\&. If the diff looks inconsequential, you can use git rebase \-\-skip to ignore it, and then git rebase\-update will clean it up for you\&.
Sometimes you\(cqre pretty certain that you\(cqve committed a certain branch, but \fBgit rebase\-update\fR isn\(cqt able to tell that for sure\&. This is usually because your branch doesn\(cqt rebase cleanly\&. You could just delete the branch with \fBgit branch \-D <branch>\fR, but you\(cqd like to double check the diff of your branch against its upstream before deleting it\&. If this is the case you can abort the rebase started by \fBgit rebase\-update\fR, and then run \fBgit-squash-branch\fR(1) to flatten your branch into a single commit\&. When you run \fBgit rebase\-update\fR again, you\(cqll get a (hopefully) much smaller / saner diff\&. If it turns out you were wrong about your branch being fully committed, you can use \fBgit-reflog\fR(1) to reset your branch back to where it was before\&. If the diff looks inconsequential, you can use \fBgit rebase \-\-skip\fR to ignore it, and then \fBgit rebase\-update\fR will clean it up for you\&.
.sp
Once you\(cqre done resolving all of the merge conflict, just run git rebase\-update, and it will pick up where it left off\&. Once the command has finished updating all of your branches, it will return you back to the branch you started on\&.
Once you\(cqre done resolving all of the merge conflict, just run \fBgit rebase\-update\fR, and it will pick up where it left off\&. Once the command has finished updating all of your branches, it will return you back to the branch you started on\&.
.if n \{\
.sp
.\}
......@@ -420,12 +420,12 @@ Once you\(cqre done resolving all of the merge conflict, just run git rebase\-up
.ps -1
.br
.sp
Running git rebase\-update will update all your branches, but it will not automatically run gclient sync to update your dependencies\&. Use caution when running git reset on branches managed by \fIdepot_tools\fR. These tools track the set of "commits contained in the branch" from a branch\(cqs "merge point" to the current branch value. See git help mark-merge-base for more discussion of the merge base.
Running \fBgit rebase\-update\fR will update all your branches, but it will not automatically run \fBgclient sync\fR to update your dependencies\&. Use caution when running \fBgit reset\fR on branches managed by \fIdepot_tools\fR\&. These tools track the set of "commits contained in the branch" from a branch\(cqs "merge point" to the current branch value\&. See \fBgit help mark\-merge\-base\fR for more discussion of the merge base\&.
.sp .5v
.RE
.SH "MANAGING MULTIPLE CLS"
.sp
Sometimes you want to work on more than one CL at once (say, you have a CL posted for review and want to work on something else)\&. For each CL that you want to work on, just use git new\-branch <branch_name>\&.
Sometimes you want to work on more than one CL at once (say, you have a CL posted for review and want to work on something else)\&. For each CL that you want to work on, just use \fBgit new\-branch <branch_name>\fR\&.
.sp
Once you start to have more than one CL at a time, it can be easy to lose your bearings\&. Fortunately, \fIdepot_tools\fR has two tools to help you out:
.sp
......@@ -488,14 +488,14 @@ Additionally, sometimes you need to switch between branches, but you\(cqve got w
.sp
\fBgit-freeze\fR(1) allows you to put the current branch in \*(Aqsuspended animation\*(Aq by committing your changes to a specially\-named commit on the top of your current branch\&. When you come back to your branch later, you can just run \fBgit-thaw\fR(1) to get your work\-in\-progress changes back to what they were\&.
.sp
Another useful tool is \fBgit-rename-branch\fR(1)\&. Unlike git branch \-m <old> <new>, this tool will correctly preserve the upstream relationships of your branch compared to its downstreams\&.
Another useful tool is \fBgit-rename-branch\fR(1)\&. Unlike \fBgit branch \-m <old> <new>\fR, this tool will correctly preserve the upstream relationships of your branch compared to its downstreams\&.
.sp
Finally, take a look at \fBgit-upstream-diff\fR(1)\&. This will show you the combined diff for all the commits on your branch against the upstream tracking branch\&. This is \fIexactly\fR what git cl upload will push up to code review\&. Additionally, consider trying the \-\-wordwise argument to get a colorized per\-word diff (instead of a per\-line diff)\&.
Finally, take a look at \fBgit-upstream-diff\fR(1)\&. This will show you the combined diff for all the commits on your branch against the upstream tracking branch\&. This is \fIexactly\fR what \fBgit cl upload\fR will push up to code review\&. Additionally, consider trying the \fB\-\-wordwise\fR argument to get a colorized per\-word diff (instead of a per\-line diff)\&.
.SH "MANAGING DEPENDENT CLS"
.sp
Now that you know how to manage \fIindependent\fR CLs, we\(cqll see how to manage \fIdependent\fR CLs\&. Dependent CLs are useful when your second (or third or fourth or \&...) CL depends on the changes in one of your other CLs (such as: CL 2 won\(cqt compile without CL 1, but you want to submit them as two separate reviews)\&.
.sp
Like all of the other CLs we\(cqve created, we use \fBgit-new-branch\fR(1), but this time with an extra argument\&. First, git checkout the branch you want to base the new one on (i\&.e\&. CL 1), and then run:
Like all of the other CLs we\(cqve created, we use \fBgit-new-branch\fR(1), but this time with an extra argument\&. First, \fBgit checkout\fR the branch you want to base the new one on (i\&.e\&. CL 1), and then run:
.sp
.if n \{\
.RS 4
......@@ -508,11 +508,11 @@ Like all of the other CLs we\(cqve created, we use \fBgit-new-branch\fR(1), but
.\}
.sp
.sp
This will make a new branch which tracks the \fIcurrent\fR branch as its upstream (as opposed to \fIorigin/main\fR)\&. All changes you commit to this branch will be in addition to the previous branch, but when you git cl upload, you will only upload the diff for the dependent (child) branch\&. You may have as many branches nested in this fashion as you like\&.
This will make a new branch which tracks the \fIcurrent\fR branch as its upstream (as opposed to \fIorigin/main\fR)\&. All changes you commit to this branch will be in addition to the previous branch, but when you \fBgit cl upload\fR, you will only upload the diff for the dependent (child) branch\&. You may have as many branches nested in this fashion as you like\&.
.sp
\fBgit-map\fR(1) and \fBgit-map-branches\fR(1) are particularly helpful when you have dependent branches\&. In addition, there are two helper commands which let you traverse your working copy up and down this tree of branches: \fBgit-nav-upstream\fR(1) and \fBgit-nav-downstream\fR(1)\&.
.sp
Sometimes when dealing with dependent CLs, it turns out that you accidentally based a branch on the wrong upstream, but since then you\(cqve committed changes to it, or even based \fIanother\fR branch off of that one\&. Or you discover that you have two independent CLs that would actually be much better off as dependent CLs\&. In instances like these, you can check out the offending branch and use \fBgit-reparent-branch\fR(1) to move it to track a different parent\&. Note that this can also be used to move a branch from tracking origin/main to lkgr or vice versa\&.
Sometimes when dealing with dependent CLs, it turns out that you accidentally based a branch on the wrong upstream, but since then you\(cqve committed changes to it, or even based \fIanother\fR branch off of that one\&. Or you discover that you have two independent CLs that would actually be much better off as dependent CLs\&. In instances like these, you can check out the offending branch and use \fBgit-reparent-branch\fR(1) to move it to track a different parent\&. Note that this can also be used to move a branch from tracking \fBorigin/main\fR to \fBlkgr\fR or vice versa\&.
.SH "EXAMPLE WALKTHROUGH"
.sp
This section will demo what a typical workflow looks like when writing, updating, and committing multiple CLs\&.
......@@ -573,14 +573,15 @@ It was a Domo\-Kuun\&.
[fix_typo 615ffa7] Fix terrible typo\&.
1 file changed, 1 insertion(+), 1 deletion(\-)
\fB$ git map\fR
* \fB615ffa7 \fR (HEAD \-> fix_typo) 2014\-04\-10 ~ Fix terrible typo\&.
* \fBbeec6f4 \fR (origin/main, origin/HEAD) 2014\-04\-10 ~ Make ReflectorImpl use mailboxes\fB <(fix_typo)\fR
* \fB41290e0 \fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds
* \fBa76fde7 \fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&.
* \fB9de7a71 \fR 2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&.
* \fB073b0c2 \fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewRenderView
* \fB2250f53 \fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path
* \fB33a7a74 \fR 2014\-04\-10 ~ Always output seccomp error messages to stderr
* \fB615ffa720f\fR \fB(HEAD \-> fix_typo\fR\fB) \fR2014\-04\-10 ~ Fix terrible typo\&.
* \fBbeec6f4746\fR \fB(origin/main\fR\fB, origin/HEAD\fR\fB) \fR2014\-04\-10 ~ Make ReflectorImpl use mailboxes
* \fB41290e02b7\fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds
* \fBa76fde7b7b\fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&.
* \fB9de7a713b3\fR 2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&.
* \fB073b0c203a\fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewRenderView
* \fB2250f532d7\fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path
* \fB33a7a742b7\fR 2014\-04\-10 ~ Always output seccomp error messages to stderr
\fB$ git status\fR
On branch fix_typo
Your branch is ahead of \*(Aqorigin/main\*(Aq by 1 commit\&.
......@@ -618,7 +619,6 @@ Your branch is up to date with \*(Aqorigin/main\*(Aq\&.
Changes not staged for commit:
(use "git add <file>\&.\&.\&." to update what will be committed)
(use "git restore <file>\&.\&.\&." to discard changes in working directory)
modified: build/whitespace_file\&.txt
no changes added to commit (use "git add" and/or "git commit \-a")
......@@ -674,17 +674,18 @@ Since we got lgtm, let the CQ land it\&.
.nf
\fB$ git cl set_commit\fR
\fB$ git map\fR
* \fB0e2e52e \fR (\fBchap2\fR) 2014\-04\-10 ~ FREEZE\&.unindexed
| * \fB2c0ad9c \fR (HEAD \-> fix_typo) 2014\-04\-10 ~ Fix typo for good!
| * \fB615ffa7 \fR 2014\-04\-10 ~ Fix terrible typo\&.
* \fB0e2e52e72e\fR \fB(chap2\fR\fB) \fR2014\-04\-10 ~ FREEZE\&.unindexed
| * \fB2c0ad9c59b\fR \fB(HEAD \-> fix_typo\fR\fB) \fR2014\-04\-10 ~ Fix typo for good!
| * \fB615ffa720f\fR 2014\-04\-10 ~ Fix terrible typo\&.
|/
* \fBbeec6f4 \fR (origin/main, origin/HEAD) 2014\-04\-10 ~ Make ReflectorImpl use mailboxes\fB <(chap2, fix_typo)\fR
* \fB41290e0 \fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds
* \fBa76fde7 \fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&.
* \fB9de7a71 \fR 2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&.
* \fB073b0c2 \fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewRenderView
* \fB2250f53 \fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path
* \fB33a7a74 \fR 2014\-04\-10 ~ Always output seccomp error messages to stderr
* \fBbeec6f4746\fR \fB(origin/main\fR\fB, origin/HEAD\fR\fB) \fR2014\-04\-10 ~ Make ReflectorImpl use mailboxes <(\fBchap2\fR)
* \fB41290e02b7\fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds
* \fBa76fde7b7b\fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&.
* \fB9de7a713b3\fR 2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&.
* \fB073b0c203a\fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewRenderView
* \fB2250f532d7\fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path
* \fB33a7a742b7\fR 2014\-04\-10 ~ Always output seccomp error messages to stderr
.fi
.if n \{\
.RE
......@@ -780,17 +781,18 @@ EOF
[chap2 ceef712] Finish chapter 2
1 file changed, 6 insertions(+)
\fB$ git map\fR
* \fBceef712 \fR (HEAD \-> chap2) 2014\-04\-10 ~ Finish chapter 2
| * \fB2c0ad9c \fR (\fBfix_typo\fR) 2014\-04\-10 ~ Fix typo for good!
| * \fB615ffa7 \fR 2014\-04\-10 ~ Fix terrible typo\&.
* \fBceef712d7f\fR \fB(HEAD \-> chap2\fR\fB) \fR2014\-04\-10 ~ Finish chapter 2
| * \fB2c0ad9c59b\fR \fB(fix_typo\fR\fB) \fR2014\-04\-10 ~ Fix typo for good!
| * \fB615ffa720f\fR 2014\-04\-10 ~ Fix terrible typo\&.
|/
* \fBbeec6f4 \fR (origin/main, origin/HEAD) 2014\-04\-10 ~ Make ReflectorImpl use mailboxes\fB <(chap2, fix_typo)\fR
* \fB41290e0 \fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds
* \fBa76fde7 \fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&.
* \fB9de7a71 \fR 2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&.
* \fB073b0c2 \fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewRenderView
* \fB2250f53 \fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path
* \fB33a7a74 \fR 2014\-04\-10 ~ Always output seccomp error messages to stderr
* \fBbeec6f4746\fR \fB(origin/main\fR\fB, origin/HEAD\fR\fB) \fR2014\-04\-10 ~ Make ReflectorImpl use mailboxes <(\fBfix_typo\fR)
* \fB41290e02b7\fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds
* \fBa76fde7b7b\fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&.
* \fB9de7a713b3\fR 2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&.
* \fB073b0c203a\fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewRenderView
* \fB2250f532d7\fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path
* \fB33a7a742b7\fR 2014\-04\-10 ~ Always output seccomp error messages to stderr
\fB$ git cl upload \-r domo@chromium\&.org \-\-send\-mail\fR
\&.\&.\&. truncated output \&.\&.\&.
.fi
......@@ -827,18 +829,19 @@ EOF
[chap3 7d4238a] beginning of chapter 3
1 file changed, 4 insertions(+)
\fB$ git map\fR
* \fB7d4238a \fR (HEAD \-> chap3) 2014\-04\-10 ~ beginning of chapter 3
* \fBceef712 \fR (\fBchap2\fR) 2014\-04\-10 ~ Finish chapter 2\fB <(chap3)\fR
| * \fB2c0ad9c \fR (\fBfix_typo\fR) 2014\-04\-10 ~ Fix typo for good!
| * \fB615ffa7 \fR 2014\-04\-10 ~ Fix terrible typo\&.
* \fB7d4238a1e2\fR \fB(HEAD \-> chap3\fR\fB) \fR2014\-04\-10 ~ beginning of chapter 3
* \fBceef712d7f\fR \fB(chap2\fR\fB) \fR2014\-04\-10 ~ Finish chapter 2
| * \fB2c0ad9c59b\fR \fB(fix_typo\fR\fB) \fR2014\-04\-10 ~ Fix typo for good!
| * \fB615ffa720f\fR 2014\-04\-10 ~ Fix terrible typo\&.
|/
* \fBbeec6f4 \fR (origin/main, origin/HEAD) 2014\-04\-10 ~ Make ReflectorImpl use mailboxes\fB <(chap2, fix_typo)\fR
* \fB41290e0 \fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds
* \fBa76fde7 \fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&.
* \fB9de7a71 \fR 2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&.
* \fB073b0c2 \fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewRenderView
* \fB2250f53 \fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path
* \fB33a7a74 \fR 2014\-04\-10 ~ Always output seccomp error messages to stderr
* \fBbeec6f4746\fR \fB(origin/main\fR\fB, origin/HEAD\fR\fB) \fR2014\-04\-10 ~ Make ReflectorImpl use mailboxes <(\fBchap2, fix_typo\fR)
* \fB41290e02b7\fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds
* \fBa76fde7b7b\fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&.
* \fB9de7a713b3\fR 2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&.
* \fB073b0c203a\fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewRenderView
* \fB2250f532d7\fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path
* \fB33a7a742b7\fR 2014\-04\-10 ~ Always output seccomp error messages to stderr
.fi
.if n \{\
.RE
......@@ -853,7 +856,7 @@ We haven\*(Aqt updated the code in a while, so let\*(Aqs do that now\&.
\fB$ git rebase\-update\fR
Fetching origin
From https://upstream
beec6f4\&.\&.59cdb73 main \-> origin/main
beec6f4\&.\&.59cdb73 main \-> origin/main
Rebasing: chap2
Rebasing: fix_typo
Failed! Attempting to squash fix_typo \&.\&.\&. Success!
......@@ -861,6 +864,8 @@ Rebasing: chap3
Reparented chap3 to track origin/main (was tracking chap2)
Deleted branch fix_typo (was 5d26fec)\&.
Deleted branch chap2 (was 5d26fec)\&.
Running `git gc \-\-auto` \- Ctrl\-C to abort is OK\&.
.fi
.if n \{\
.RE
......@@ -875,20 +880,21 @@ Well look at that\&. The CQ landed our typo and chapter2 branches already and gi
\fB$ gclient sync\fR
\&.\&.\&. truncated output \&.\&.\&.
\fB$ git map\fR
* \fB93fe917 \fR (HEAD \-> chap3) 2014\-04\-10 ~ beginning of chapter 3
* \fB5d26fec \fR (origin/main, origin/HEAD) 2014\-04\-10 ~ Finish chapter 2\fB <(chap3)\fR
* \fBdf7fefb \fR 2014\-04\-10 ~ Revert 255617, due to it not tracking use of the link doctor page properly\&.
* \fB4b39cda \fR 2014\-04\-10 ~ Fix terrible typo\&.
* \fB248c5b6 \fR 2014\-04\-10 ~ Temporarily CHECK(trial) in ChromeRenderProcessObserver::OnSetFieldTrialGroup\&.
* \fB8171df8 \fR 2014\-04\-10 ~ Remove AMD family check for the flapper crypto accelerator\&.
* \fBd6a30d2 \fR 2014\-04\-10 ~ Change the Pica load benchmark to listen for the polymer\-ready event
* \fBbeec6f4 \fR 2014\-04\-10 ~ Make ReflectorImpl use mailboxes
* \fB41290e0 \fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds
* \fBa76fde7 \fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&.
* \fB9de7a71 \fR 2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&.
* \fB073b0c2 \fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewRenderView
* \fB2250f53 \fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path
* \fB33a7a74 \fR 2014\-04\-10 ~ Always output seccomp error messages to stderr
* \fB93fe917ad1\fR \fB(HEAD \-> chap3\fR\fB) \fR2014\-04\-10 ~ beginning of chapter 3
* \fB5d26fec369\fR \fB(origin/main\fR\fB, origin/HEAD\fR\fB) \fR2014\-04\-10 ~ Finish chapter 2
* \fBdf7fefbf06\fR 2014\-04\-10 ~ Revert 255617, due to it not tracking use of the link doctor page properly\&.
* \fB4b39cda0ac\fR 2014\-04\-10 ~ Fix terrible typo\&.
* \fB248c5b6fe3\fR 2014\-04\-10 ~ Temporarily CHECK(trial) in ChromeRenderProcessObserver::OnSetFieldTrialGroup\&.
* \fB8171df8af9\fR 2014\-04\-10 ~ Remove AMD family check for the flapper crypto accelerator\&.
* \fBd6a30d2e56\fR 2014\-04\-10 ~ Change the Pica load benchmark to listen for the polymer\-ready event
* \fBbeec6f4746\fR 2014\-04\-10 ~ Make ReflectorImpl use mailboxes
* \fB41290e02b7\fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds
* \fBa76fde7b7b\fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&.
* \fB9de7a713b3\fR 2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&.
* \fB073b0c203a\fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewRenderView
* \fB2250f532d7\fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path
* \fB33a7a742b7\fR 2014\-04\-10 ~ Always output seccomp error messages to stderr
.fi
.if n \{\
.RE
......@@ -903,7 +909,7 @@ Someone on IRC mentions that they actually landed a chapter 3 already! We should
\fB$ git rebase\-update\fR
Fetching origin
From https://upstream
5d26fec\&.\&.59cdb73 main \-> origin/main
5d26fec\&.\&.59cdb73 main \-> origin/main
Rebasing: chap2
\&.\&.\&. lots of output, it\*(Aqs a conflict alright :(\&.\&.\&.
\fB$ git diff\fR
......@@ -920,7 +926,7 @@ Rebasing: chap2
++=======
+ Mr\&. Usagi felt that something wasn\*(Aqt right\&. Shortly after the Domo\-Kun left he
+ began feeling sick\&.
++>>>>>>> beginning of chapter 3
++>>>>>>> 93fe917 (beginning of chapter 3)
.fi
.if n \{\
.RE
......@@ -959,30 +965,34 @@ Much better
.\}
.nf
\fB$ git rebase \-\-continue\fR
Applying: beginning of chapter 3
[detached HEAD 1cb4f5b] beginning of chapter 3
1 file changed, 2 insertions(+), 1 deletion(\-)
\fB$ git rebase\-update\fR
Fetching origin
chap3 up\-to\-date
Running `git gc \-\-auto` \- Ctrl\-C to abort is OK\&.
\fB$ gclient sync\fR
\&.\&.\&. truncated output \&.\&.\&.
\fB$ git map\fR
* \fB1cb4f5b \fR (HEAD \-> chap3) 2014\-04\-10 ~ beginning of chapter 3
* \fB59cdb73 \fR (origin/main, origin/HEAD) 2014\-04\-10 ~ Refactor data interchange format\&.\fB <(chap3)\fR
* \fB34676a3 \fR 2014\-04\-10 ~ Ensure FS is exited for all not\-in\-same\-page navigations\&.
* \fB7d4784e \fR 2014\-04\-10 ~ Add best chapter2 ever!
* \fB5d26fec \fR 2014\-04\-10 ~ Finish chapter 2
* \fBdf7fefb \fR 2014\-04\-10 ~ Revert 255617, due to it not tracking use of the link doctor page properly\&.
* \fB4b39cda \fR 2014\-04\-10 ~ Fix terrible typo\&.
* \fB248c5b6 \fR 2014\-04\-10 ~ Temporarily CHECK(trial) in ChromeRenderProcessObserver::OnSetFieldTrialGroup\&.
* \fB8171df8 \fR 2014\-04\-10 ~ Remove AMD family check for the flapper crypto accelerator\&.
* \fBd6a30d2 \fR 2014\-04\-10 ~ Change the Pica load benchmark to listen for the polymer\-ready event
* \fBbeec6f4 \fR 2014\-04\-10 ~ Make ReflectorImpl use mailboxes
* \fB41290e0 \fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds
* \fBa76fde7 \fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&.
* \fB9de7a71 \fR 2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&.
* \fB073b0c2 \fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewRenderView
* \fB2250f53 \fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path
* \fB33a7a74 \fR 2014\-04\-10 ~ Always output seccomp error messages to stderr
* \fB1cb4f5b622\fR \fB(HEAD \-> chap3\fR\fB) \fR2014\-04\-10 ~ beginning of chapter 3
* \fB59cdb7335b\fR \fB(origin/main\fR\fB, origin/HEAD\fR\fB) \fR2014\-04\-10 ~ Refactor data interchange format\&.
* \fB34676a3583\fR 2014\-04\-10 ~ Ensure FS is exited for all not\-in\-same\-page navigations\&.
* \fB7d4784e867\fR 2014\-04\-10 ~ Add best chapter2 ever!
* \fB5d26fec369\fR 2014\-04\-10 ~ Finish chapter 2
* \fBdf7fefbf06\fR 2014\-04\-10 ~ Revert 255617, due to it not tracking use of the link doctor page properly\&.
* \fB4b39cda0ac\fR 2014\-04\-10 ~ Fix terrible typo\&.
* \fB248c5b6fe3\fR 2014\-04\-10 ~ Temporarily CHECK(trial) in ChromeRenderProcessObserver::OnSetFieldTrialGroup\&.
* \fB8171df8af9\fR 2014\-04\-10 ~ Remove AMD family check for the flapper crypto accelerator\&.
* \fBd6a30d2e56\fR 2014\-04\-10 ~ Change the Pica load benchmark to listen for the polymer\-ready event
* \fBbeec6f4746\fR 2014\-04\-10 ~ Make ReflectorImpl use mailboxes
* \fB41290e02b7\fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds
* \fBa76fde7b7b\fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&.
* \fB9de7a713b3\fR 2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&.
* \fB073b0c203a\fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewRenderView
* \fB2250f532d7\fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path
* \fB33a7a742b7\fR 2014\-04\-10 ~ Always output seccomp error messages to stderr
\fB$ git cl upload\fR
\&.\&.\&. truncated output \&.\&.\&.
.fi
......@@ -991,7 +1001,7 @@ chap3 up\-to\-date
.\}
.sp
.sp
So there you have the basic flow\&. Note that you don\(cqt \fIhave\fR to do chromium development using these tools\&. Any git workflow is compatible, as long as git cl upload is able to upload good patches\&.
So there you have the basic flow\&. Note that you don\(cqt \fIhave\fR to do chromium development using these tools\&. Any git workflow is compatible, as long as \fBgit cl upload\fR is able to upload good patches\&.
.SH "CONCLUSION"
.sp
Hopefully that gives you a good starting overview on Chromium development using \fIdepot_tools\fR\&. If you have questions which weren\(cqt answered by this tutorial or the man pages for the tools (see the index of all tools here: \fBdepot_tools\fR(7)), please feel free to ask\&.
......@@ -1006,7 +1016,7 @@ A
DEPS
.RS 4
A file in the chromium checkout which
gclient sync
\fBgclient sync\fR
uses to determine what dependencies to pull in\&. This file also contains
\fIhooks\fR\&.
.RE
......@@ -1016,7 +1026,7 @@ LKGR
Last Known Good Revision\&. This is a
\fBgit-tag\fR(1)
which tracks the last version of
origin/main
\fBorigin/main\fR
which has passed the full set of testing on the
\m[blue]\fBmain Chromium waterfall\fR\m[]\&\s-2\u[6]\d\s+2\&.
.RE
......
man/src/make_docs.sh
View file @ 26adc2a9
......@@ -34,13 +34,13 @@ then
fi
# We pull asciidoc to get the right version
BRANCH=8.6.9
ASCIIDOC_HASH=2ff8681
if [[ ! -d asciidoc || $(cd asciidoc && git rev-parse --short HEAD) != $ASCIIDOC_HASH ]]
BRANCH=9.1.0
ASCIIDOC_HASH=9705d428439530104ce55d0ba12e8ef9d1b57ad1
if [[ ! -d asciidoc || $(cd asciidoc && git rev-parse HEAD) != $ASCIIDOC_HASH ]]
then
echo Cloning asciidoc
rm -rf asciidoc
git clone --branch $BRANCH https://github.com/asciidoc/asciidoc asciidoc
git clone --branch $BRANCH https://github.com/asciidoc-py/asciidoc-py asciidoc
(cd asciidoc && ln -s asciidoc.py asciidoc)
fi
echo Asciidoc up to date at $ASCIIDOC_HASH \($BRANCH\)
......@@ -48,42 +48,32 @@ echo Asciidoc up to date at $ASCIIDOC_HASH \($BRANCH\)
export PATH=`pwd`/asciidoc:$PATH
# We pull ansi2hash to convert demo script output
BRANCH=1.0.6
ANSI2HTML_HASH=6282ab7a24a5a7eab2e0b23bb0055234c533a6e9
BRANCH=1.6.0
ANSI2HTML_HASH=1ca0e862dda765c55e9124bf50a06a3e2f769521
if [[ ! -d ansi2html || $(git -C ansi2html rev-parse HEAD) != $ANSI2HTML_HASH ]]
then
echo Cloning ansi2html
rm -rf ansi2html
git clone --single-branch --branch $BRANCH --depth 1 \
https://github.com/ralphbean/ansi2html.git 2> /dev/null
curl https://bitbucket.org/gutworth/six/raw/a875ac34c777fe801569c6c5299bf1a35aa578cd/six.py > \
ansi2html/ansi2html/six.py
ed ansi2html/ansi2html/converter.py <<EOF
/version_str
s/pkg.*$/'cool version bro'
wq
EOF
https://github.com/pycontribs/ansi2html.git 2> /dev/null
fi
echo ansi2html up to date at $ANSI2HTML_HASH \($BRANCH\)
# We pull git to get its documentation toolchain
BRANCH=v1.9.0
GITHASH=5f95c9f850b19b368c43ae399cc831b17a26a5ac
BRANCH=v2.32.0
GITHASH=ebf3c04b262aa27fbb97f8a0156c2347fecafafb
if [[ ! -d git || $(git -C git rev-parse HEAD) != $GITHASH ]]
then
echo Cloning git
rm -rf git
git clone --single-branch --branch $BRANCH --depth 1 \
https://kernel.googlesource.com/pub/scm/git/git.git 2> /dev/null
# Replace the 'source' and 'package' strings.
ed git/Documentation/asciidoc.conf <<EOF
ed git/Documentation/Makefile <<EOF
H
81
s/Git/depot_tools
+2
141
s/Git Manual/Chromium depot_tools Manual
s/Git/depot_tools
wq
EOF
......@@ -222,6 +212,7 @@ done
if [[ ${#HTML_TARGETS} == 0 && ${#MAN1_TARGETS} == 0 && ${#MAN7_TARGETS} == 0 ]]
then
echo No targets to build
exit
fi
......@@ -238,7 +229,7 @@ fi
(
export GIT_DIR="$(git rev-parse --git-dir)" &&
cd git/Documentation &&
make -j"$JOBS" "${MAN1_TARGETS[@]}" "${MAN7_TARGETS[@]}" "${HTML_TARGETS[@]}"
GIT_EDITOR=true make -j"$JOBS" "${MAN1_TARGETS[@]}" "${MAN7_TARGETS[@]}" "${HTML_TARGETS[@]}"
)
for x in "${HTML_TARGETS[@]}"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment