summaryrefslogtreecommitdiff
path: root/Documentation/git-reset.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-02-16 21:35:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-02-16 21:35:50 (GMT)
commitae86372fcd1204c9acda8ea7f91d2995bdb39ab1 (patch)
tree77f361b3be31439b6e5e654f766cc071dcd711f5 /Documentation/git-reset.txt
parent7326451bedaa67d29afe02184b166e28d9393c91 (diff)
downloadgit-ae86372fcd1204c9acda8ea7f91d2995bdb39ab1.zip
git-ae86372fcd1204c9acda8ea7f91d2995bdb39ab1.tar.gz
git-ae86372fcd1204c9acda8ea7f91d2995bdb39ab1.tar.bz2
Revert "reset: add an example of how to split a commit into two"
This reverts commit 7326451bedaa67d29afe02184b166e28d9393c91; a better rewrite will be queued separately.
Diffstat (limited to 'Documentation/git-reset.txt')
-rw-r--r--Documentation/git-reset.txt38
1 files changed, 0 insertions, 38 deletions
diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
index add6220..25432d9 100644
--- a/Documentation/git-reset.txt
+++ b/Documentation/git-reset.txt
@@ -292,44 +292,6 @@ $ git reset --keep start <3>
<3> But you can use "reset --keep" to remove the unwanted commit after
you switched to "branch2".
-Split a commit into two::
-+
-Suppose that you have created a commit, but later decide that you want to break
-apart the changes into two logical chunks and commit each separately. You want
-to include part of the original commit into the first commit, while including
-the remainder in a second commit. You can use git reset to rewind the history
-without changing the index, and then use git add -p to interactively select
-which hunks to put into the first commit.
-+
-------------
-$ git reset HEAD^ <1>
-$ git add -p <2>
-$ git diff --cached <3>
-$ git commit -c HEAD@{1} <4>
-...
-$ git add ... <5>
-$ git diff --cached <6>
-$ git commit ... <7>
-------------
-+
-<1> First, reset the history back one commit so that we remove the original
- commit, but leave the working tree with all the changes.
-<2> Now, interactively select hunks to add to a new commit using git add -p.
- This will ask for each hunk separately and you can use simple commands like
- "yes, include", "no don't include" or even "edit".
-<3> Once satisfied with the hunks, you should verify that it is what you
- expected by using git diff --cached to show all changes in the index.
-<4> Next, commit the changes stored in the index. "-c" specifies to load the
- editor with a commit message from a previous commit so that you can re-use the
- original commit message. HEAD@{1} is special notation to reference what
- HEAD used to be prior to the reset command. See linkgit:git-reflog[1] for
- more details.
-<5> Now you've created the first commit, and can repeat steps 2-4 as often as
- you like to break the work into any number of commits. Here we show a second
- step which simply adds the remaining changes.
-<6> Then check again that the changes are what you expected to add.
-<7> And finally commit the remaining changes.
-
DISCUSSION
----------