diff options
Diffstat (limited to 'development/git.html')
| -rw-r--r-- | development/git.html | 39 |
1 files changed, 36 insertions, 3 deletions
diff --git a/development/git.html b/development/git.html index e5e0e62..4dbf81b 100644 --- a/development/git.html +++ b/development/git.html @@ -159,13 +159,15 @@ <h2 id="working-areas"><a class="header" href="#working-areas">Working areas</a></h2> <pre><code class="language-text">+-------------------+ --- stash -----> +-------+ | working directory | | stash | // Shelving area. -+-------------------+ <-- stash pop -- +-------+ +| (worktree) | <-- stash pop -- +-------+ ++-------------------+ | ^ add | | reset v | +-------------------+ | staging area | +| (index) | +-------------------+ | commit @@ -324,8 +326,39 @@ the same repository (shared .git folder).</p> tracked files in the working tree since <commit> are lost git reset HEAD <file> .......... remove file from staging - git reset --soft HEAD~1 ........ delete most recent commit but keep work - git reset --hard HEAD~1 ........ delete most recent commit and delete work + git reset --soft HEAD~1 ........ delete most recent commit; dont revert index & worktree + git reset --mixed HEAD~1 ....... delete most recent commit; revert index; dont revert worktree + git reset --hard HEAD~1 ........ delete most recent commit; revert index & worktree +</code></pre> +<p>Assuming an initial history <code>A - B - C - D</code> where <code>HEAD</code> currently points at +<code>D</code>, the different reset operations work as shown below.</p> +<p><strong>Soft</strong> reset.</p> +<pre><code>git reset --soft HEAD~2 + +history: A - B + ^HEAD + +-> local history is reverted, HEAD moved to B. +-> changes from C + D are still in the worktree & index (appear as staged changes). +</code></pre> +<p><strong>Mixed</strong> reset.</p> +<pre><code>git reset --mixed HEAD~2 + +history: A - B + ^HEAD + +-> local history is reverted, HEAD moved to B. +-> changed from C + D are reverted in the index. +-> changes from C + D are still in the worktree (appear as unstaged changes). +</code></pre> +<p><strong>Hard</strong> reset.</p> +<pre><code>git reset --head HEAD~2 + +history: A - B + ^HEAD + +-> local history is reverted, HEAD moved to B. +-> changes from C + D also reverted in the worktree & index (no pending changes). </code></pre> <h2 id="submodules"><a class="header" href="#submodules">Submodules</a></h2> <pre><code class="language-markdown"> git submodule add <url> [<path>] .......... add new submodule to current project |