From 0cf0869c24bfb00dfd7884f0e40565c2859df3f3 Mon Sep 17 00:00:00 2001
From: johannst <johannst@users.noreply.github.com>
Date: Sun, 20 Mar 2022 21:16:42 +0000
Subject: deploy: 9b3a0b3c1d7afa35c5eb56a69600af841e0b78b5

---
 tools/git.html | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

(limited to 'tools/git.html')

diff --git a/tools/git.html b/tools/git.html
index ce6c876..d4bb610 100644
--- a/tools/git.html
+++ b/tools/git.html
@@ -153,7 +153,34 @@
                 <div id="content" class="content">
                     <main>
                         <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>
@@ -209,6 +236,8 @@
 
   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;
-- 
cgit v1.2.3