diff options
Diffstat (limited to 'tools/git.html')
-rw-r--r-- | tools/git.html | 31 |
1 files changed, 30 insertions, 1 deletions
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 -----> +-------+ +| working directory | | stash | // Shelving area. ++-------------------+ <-- 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 [<file>] ............ partial staging (interactive) </code></pre> <h2><a class="header" href="#remote" id="remote">Remote</a></h2> @@ -209,6 +236,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> </code></pre> <h2><a class="header" href="#patching" id="patching">Patching</a></h2> <pre><code class="language-markdown"> git format-patch <opt> <since>/<revision range> |