deploy: 9b3a0b3c1d7afa35c5eb56a69600af841e0b78b5

1 files changed, 41 insertions, 1 deletions

diff --git a/print.html b/print.html
index 074f644..529c6cf 100644
--- a/print.html
+++ b/print.html
@@ -896,7 +896,34 @@ y     yank selected text
 list-keys -t vi-copy                list keymaps for vi-copy mode
 </code></pre>
 <h1><a class="header" href="#git1" id="git1">git(1)</a></h1>
-<h2><a class="header" href="#staging" id="staging">staging</a></h2>
+<h2><a class="header" href="#working-areas" id="working-areas">Working areas</a></h2>
+<pre><code class="language-text">+-------------------+ --- stash -----&gt; +-------+
+| working directory |                  | stash |  // Shelving area.
++-------------------+ &lt;-- stash pop -- +-------+
+      |       ^
+     add      |
+      |     reset
+      v       |
++-------------------+
+|   staging area    |
++-------------------+
+      |
+    commit
+      |
+      v
++-------------------+
+| local repository  |
++-------------------+
+      |       ^
+     push     |
+      |     fetch /
+      |      pull
+      v       |
++-------------------+
+| remote repository |
++-------------------+
+</code></pre>
+<h2><a class="header" href="#staging" id="staging">Staging</a></h2>
 <pre><code class="language-markdown">  git add -p [&lt;file&gt;] ............ partial staging (interactive)
 </code></pre>
 <h2><a class="header" href="#remote" id="remote">Remote</a></h2>
@@ -952,6 +979,8 @@ list-keys -t vi-copy                list keymaps for vi-copy mode
 
   git show --stat &lt;commit&gt; ................ show files changed by &lt;commit&gt;
   git show &lt;commit&gt; [&lt;file&gt;] .............. show diffs for &lt;commit&gt;
+
+  git git show &lt;commit&gt;:&lt;file&gt; ............ show &lt;file&gt; at &lt;commit&gt;
 </code></pre>
 <h2><a class="header" href="#patching" id="patching">Patching</a></h2>
 <pre><code class="language-markdown">  git format-patch &lt;opt&gt; &lt;since&gt;/&lt;revision range&gt;
@@ -1515,6 +1544,17 @@ gpg --verify &lt;file&gt;.asc &lt;file&gt;
           &lt;bp_list&gt;: Space separates list, eg 'command 2 5-8' to run command
           for breakpoints: 2,5,6,7,8.
 </code></pre>
+<h2><a class="header" href="#watchpoints" id="watchpoints">Watchpoints</a></h2>
+<pre><code class="language-markdown">  watch [-location|-l] &lt;expr&gt; [thread &lt;tnum&gt;]
+          Create a watchpoint for &lt;expr&gt;, will break if &lt;expr&gt; is written to.
+          Watchpoints respect scope of variables, -l can be used to watch the
+          memory location instead.
+  rwatch ...
+          Sets a read watchpoint, will break if &lt;expr&gt; is read from.
+  awatch ...
+          Sets an access watchpoint, will break if &lt;expr&gt; is written to or read
+          from.
+</code></pre>
 <h2><a class="header" href="#inspection-1" id="inspection-1">Inspection</a></h2>
 <pre><code class="language-markdown">  info functions [&lt;regex&gt;]
           List functions matching &lt;regex&gt;. List all functions if no &lt;regex&gt;