From 58c6d98940ca322bfe91d8ae6c8fc3e988347513 Mon Sep 17 00:00:00 2001
From: Johannes Stoelp <johannes.stoelp@gmail.com>
Date: Sun, 20 Mar 2022 21:58:51 +0100
Subject: git: added working areas + file at specific commit

---
 src/tools/git.md | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

(limited to 'src/tools')

diff --git a/src/tools/git.md b/src/tools/git.md
index a626eae..7262ba4 100644
--- a/src/tools/git.md
+++ b/src/tools/git.md
@@ -1,6 +1,35 @@
 # git(1)
 
-## staging
+## Working areas
+```text
++-------------------+ --- stash -----> +-------+
+| working directory |                  | stash |  // Shelving area.
++-------------------+ <-- stash pop -- +-------+
+      |       ^
+     add      |
+      |     reset
+      v       |
++-------------------+
+|   staging area    |
++-------------------+
+      |
+    commit
+      |
+      v
++-------------------+
+| local repository  |
++-------------------+
+      |       ^
+     push     |
+      |     fetch /
+      |      pull
+      v       |
++-------------------+
+| remote repository |
++-------------------+
+```
+
+## Staging
 ```markdown
   git add -p [<file>] ............ partial staging (interactive)
 ```
@@ -67,6 +96,8 @@
 
   git show --stat <commit> ................ show files changed by <commit>
   git show <commit> [<file>] .............. show diffs for <commit>
+
+  git git show <commit>:<file> ............ show <file> at <commit>
 ```
 
 ## Patching
-- 
cgit v1.2.3