Skip to content

Commit

Permalink
user-manual: use detached head when rewriting history
Browse files Browse the repository at this point in the history
This is slightly simpler if we use a detached head.  And it's probably
good to have another example that uses this feature.

Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
J. Bruce Fields authored and Junio C Hamano committed Apr 16, 2007
1 parent a536b08 commit 25d9f3f
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions Documentation/user-manual.txt
Original file line number Diff line number Diff line change
Expand Up @@ -504,6 +504,7 @@ $ cat .git/HEAD
ref: refs/heads/master
------------------------------------------------

[[detached-head]]
Examining an old version without creating a new branch
------------------------------------------------------

Expand Down Expand Up @@ -2055,22 +2056,22 @@ $ git tag bad mywork~5

(Either gitk or git-log may be useful for finding the commit.)

Then check out a new branch at that commit, edit it, and rebase the rest of
the series on top of it:
Then check out that commit, edit it, and rebase the rest of the series
on top of it (note that we could check out the commit on a temporary
branch, but instead we're using a <<detached-head,detached head>>):

-------------------------------------------------
$ git checkout -b TMP bad
$ git checkout bad
$ # make changes here and update the index
$ git commit --amend
$ git rebase --onto TMP bad mywork
$ git rebase --onto HEAD bad mywork
-------------------------------------------------

When you're done, you'll be left with mywork checked out, with the top patches
on mywork reapplied on top of the modified commit you created in TMP. You can
When you're done, you'll be left with mywork checked out, with the top
patches on mywork reapplied on top of your modified commit. You can
then clean up with

-------------------------------------------------
$ git branch -d TMP
$ git tag -d bad
-------------------------------------------------

Expand Down

0 comments on commit 25d9f3f

Please sign in to comment.