Databases
StackOverflow2013
Postsdbo
PO
 

Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>No, there doesn't seem to be any difference.<br> It is more to illustrate the <code>git reset --soft</code> (i.e. moving HEAD only, which can <a href="https://stackoverflow.com/a/5203843/6309">have other more practical uses</a>)</p> <p><code>git reset HEAD</code> is for "unstaging", and a simple <code>git reset HEAD^</code> does both (move the HEAD, and unstage, no need for <code>--mixed</code>, since it is the default option)</p> <hr> <p>Here is a quick test to see what that looks like:</p> <p>Before (you just switch back to feature, where you committed a "<code>wip</code>" -- work in progress):</p> <pre><code>C:\Users\VonC\prog\git\test\r\r3&gt;gl * 6ac95bd - (origin/master, origin/HEAD, master) fix in master (2 minutes ago) &lt;VonC&gt; | * fd8d97d - (HEAD, origin/feature, feature) snap WIP (3 minutes ago) &lt;VonC&gt; | * 16066dd - f1 (3 minutes ago) &lt;VonC&gt; |/ * e8ad96f - f1 (3 minutes ago) &lt;VonC&gt; </code></pre> <p>The reset itself:</p> <pre><code>C:\Users\VonC\prog\git\test\r\r3&gt;git reset "HEAD^" Unstaged changes after reset: M f </code></pre> <p>That gives you the status:</p> <pre><code>C:\Users\VonC\prog\git\test\r\r3&gt;git st # On branch feature # Your branch is behind 'origin/feature' by 1 commit, and can be fast-forwarded. # (use "git pull" to update your local branch) # # Changes not staged for commit: # (use "git add &lt;file&gt;..." to update what will be committed) # (use "git checkout -- &lt;file&gt;..." to discard changes in working directory) # # modified: f # no changes added to commit (use "git add" and/or "git commit -a") </code></pre> <p>log after <code>git reset HEAD^</code></p> <pre><code>C:\Users\VonC\prog\git\test\r\r3&gt;gl * 6ac95bd - (origin/master, origin/HEAD, master) fix in master (6 minutes ago) &lt;VonC&gt; | * fd8d97d - (origin/feature) snap WIP (7 minutes ago) &lt;VonC&gt; | * 16066dd - (HEAD, feature) f1 (7 minutes ago) &lt;VonC&gt; |/ * e8ad96f - f1 (8 minutes ago) &lt;VonC&gt; </code></pre> <hr> <p>In two steps, you would have seen the following log after the <code>git reset --soft HEAD^</code>:</p> <pre><code>C:\Users\VonC\prog\git\test\r\r2&gt;gl * 6ac95bd - (origin/master, origin/HEAD, master) fix in master (65 seconds ago) &lt;VonC&gt; | * fd8d97d - (origin/feature) snap WIP (89 seconds ago) &lt;VonC&gt; | * 16066dd - (HEAD, feature) f1 (2 minutes ago) &lt;VonC&gt; |/ * e8ad96f - f1 (2 minutes ago) &lt;VonC&gt; </code></pre> <p>You index would still reflect what was staged for <code>wip</code>:</p> <pre><code>C:\Users\VonC\prog\git\test\r\r2&gt;git st # On branch feature # Your branch is behind 'origin/feature' by 1 commit, and can be fast-forwarded. # (use "git pull" to update your local branch) # # Changes to be committed: # (use "git reset HEAD &lt;file&gt;..." to unstage) # # modified: f # </code></pre> <p>The reset would then unstaged, bringing you back to the same stage than a <code>git reset HEAD^</code> would have in one step:</p> <pre><code>C:\Users\VonC\prog\git\test\r\r2&gt;git reset Unstaged changes after reset: M f C:\Users\VonC\prog\git\test\r\r2&gt;git st # On branch feature # Your branch is behind 'origin/feature' by 1 commit, and can be fast-forwarded. # (use "git pull" to update your local branch) # # Changes not staged for commit: # (use "git add &lt;file&gt;..." to update what will be committed) # (use "git checkout -- &lt;file&gt;..." to discard changes in working directory) # # modified: f # no changes added to commit (use "git add" and/or "git commit -a") </code></pre>
    singulars
    1. This table or related slice is empty.
    1. POWhy explicitly call git reset --soft before git reset (--mixed)
      singulars
      1. PTQuestion
    1. PTAnswer
    1. USCommunity
    1. USVonC
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. POWhy explicitly call git reset --soft before git reset (--mixed)
      singulars
      1. PTQuestion
    1. This table or related slice is empty.
    1. VO
      singulars
      1. PO
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. PO
      1. This table or related slice is empty.
      1. VTUpMod
    3. VO
      singulars
      1. PO
      1. This table or related slice is empty.
      1. VTUpMod
    1. COThanks for the confirmation. And certainly there are other uses for git reset --soft. (In the most basic case, there's often simply no reason to reset the index as well, in which case --soft will save you having to re-stage the files.) But good to know for sure that there's no need for the two-stage process if you're planning to reset the index as well anyway. Why type more characters than necessary?
      singulars
      1. PO
      1. USNathan Stretch
    2. CO@NathanStretch I agree. It is more to give a choice (in case you committed a work in progress composed of evolutions that should be staged, and *other* evolutions that should be staged *separately*: then, you unstage everything, and `git add` what you want to commit first in your wip.
      singulars
      1. PO
      1. USVonC
 

Querying!

 
Guidance
A row detail

Detail views are divided into sections. All the information in the data section comes from columns in the selected row. The other sections display data from other, related rows.

Related data can be related in a to-one or a to-many fashion. Captions of data related in a to-many fashion link to a list view showing a filtered view of the table.

Try moving around until you find a non-empty to-many entry and click on the label to get to one. You can move back to the root by clicking on the database name in the header.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload