Databases
StackOverflow2013
Postsdbo
PO
 

Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>The most obvious solution is to create two commits, and merge them. This is fairly safe, as once you get your changes into two different commits, it's fairly hard to lose them, and if the merge doesn't go as you want, you can throw away the merge commit and try again.</p> <p>For the first commit, you already have the changes staged, so just <code>git commit</code> should be sufficient.</p> <p>For the second, you have a state in your working copy that represents changes to the original <code>HEAD</code>. But now that you've done that commit, there's an intervening one; <code>HEAD</code> is what was in the index, so it looks like your working copy reverts those changes. To get around this, we need to reset where our <code>HEAD</code> points, without changing what's in the working copy.</p> <p>Before doing so, let's save a pointer to our current <code>HEAD</code>: <code>git branch was-in-index</code>. Now we can reset to the previous <code>HEAD</code> (the parent of <code>HEAD</code>) with <code>git reset HEAD^</code>, and add and commit our changes <code>git add some stuff; git commit</code> (or <code>git commit -a</code>, if you want all of your changes).</p> <p>Now we have two branches; our current one, which contains the changes from the working copy, and <code>was-in-index</code>, which contains the changes which were in the index. Now you can merge these however you want; <code>git merge was-in-index</code>, <code>git rebase was-in-index</code>, or what have you. You can delete the <code>was-in-index</code> branch when you're done.</p>
    singulars
    1. This table or related slice is empty.
    1. POGit: Merge staged file with the one in working tree
      singulars
      1. PTQuestion
    1. PTAnswer
    1. This table or related slice is empty.
    1. USBrian Campbell
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. POGit: Merge staged file with the one in working tree
      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. VTAcceptedByOriginator
    3. VO
      singulars
      1. PO
      1. This table or related slice is empty.
      1. VTDownMod
    1. COThis is a fairly standard solution. Well, I want to merge index with working tree because it saves all these work. You stage M1 and later merge it back, very lightweight and good for small modifications. But your answer is detailed and excellent. Accepted.
      singulars
      1. PO
      1. USCyker
    2. COcheck out mine with stash. I think it's more what you're after.
      singulars
      1. PO
      1. USAdam Dymitruk
 

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