~sircmpwn/public-inbox

This thread contains a patchset. You're looking at the original emails, but you may wish to use the patch review UI. Review patch
1

[PATCH git-rebase.io] Note the difference between soft and mixed reset

Details
Message ID
<20190510160859.6057-1-wolf480@interia.pl>
Sender timestamp
1557504539
DKIM signature
pass
Download raw message
Patch: +17 -5
Add a footnote explaining the difference between a soft reset
and a mixed reset.

Also renumber footnote 3 to 4, to keep the order consistent
with their appearance in the text.
---
I'm not sure if my explanation is understandable enough to the target
audience, but I hope it's better than nothing.

 index.html | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/index.html b/index.html
index 6f04872..a3e6610 100644
--- a/index.html
+++ b/index.html
@@ -442,7 +442,8 @@ Once you are satisfied with your changes, run
  git rebase --continue</pre>
        <p>
          We could follow these instructions to <em>add</em> new changes to the
          commit, but instead let's do a "soft reset" by running <code>git
          commit, but instead let's do a "soft reset"<sup><a href="#note-3"
          id="ref-3">3</a></sup> by running <code>git
            reset HEAD^</code>. If you run <code>git status</code> after this,
          you'll see that it un-commits the latest commit and adds its changes
          to the working tree:
@@ -646,8 +647,8 @@ git rebase origin/master</pre>
git rebase master</pre>
        <p>
          The non-interactive rebase does the default operation for all
          implicated commits ("pick")<a id="ref-3"
            href="#note-3"><sup>3</sup></a>, which simply rolls your history
          implicated commits ("pick")<a id="ref-4"
            href="#note-4"><sup>4</sup></a>, which simply rolls your history
          back to the last common anscestor and replays the commits from both
          branches. Your history now looks like this:
        </p>
@@ -712,11 +713,22 @@ git rebase master</pre>
        </div>
        <div>
          <sup id="note-3">
            3: Actually, it doesn't. The default non-interactive behavior
            3: Actually, it's a "mixed reset". A "soft reset" (done with
            <code>git reset --soft</code>) would keep the changes staged,
            so that you don't need to <code>git add</code> them again,
            and can commit them all in one go. This is not what we want
            here. We want to selectively stage parts of the changes
            in order to split the commit.
            <a href="#ref-3">↩</a>
          </sup>
        </div>
        <div>
          <sup id="note-4">
            4: Actually, it doesn't. The default non-interactive behavior
            differs slightly from the interactive behavior at the time of
            writing, in a way which is generally not important. This may change
            in the future - the relevant discussions are underway on the git
            mailing list. <a href="#ref-3">↩</a>
            mailing list. <a href="#ref-4">↩</a>
          </sup>
        </div>
      </footer>
-- 
2.21.0

Re: [PATCH git-rebase.io] Note the difference between soft and mixed reset

Details
Message ID
<20190510204037.GE1236@homura.localdomain>
In-Reply-To
<20190510160859.6057-1-wolf480@interia.pl> (view parent)
Sender timestamp
1557520837
DKIM signature
pass
Download raw message
Thanks!

To git.sr.ht:~sircmpwn/git-rebase.io
   06cf789..1440e71  master -> master