Merge branch 'maint'

[git.git] / Documentation / git-reset.txt

diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
index 6abaeac28cb70bcff809c803d732f79630c8046f..abb25d1c00c97144b1f3709e408fe9cad613e623 100644 (file)
--- a/Documentation/git-reset.txt
+++ b/Documentation/git-reset.txt
@@ -8,7 +8,7 @@ git-reset - Reset current HEAD to the specified state
 SYNOPSIS
 --------
 [verse]
 SYNOPSIS
 --------
 [verse]

-'git reset' [--mixed | --soft | --hard] [-q] [<commit>]
+'git reset' [--mixed | --soft | --hard | --merge] [-q] [<commit>]

 'git reset' [-q] [<commit>] [--] <paths>...
 
 DESCRIPTION
 'git reset' [-q] [<commit>] [--] <paths>...
 
 DESCRIPTION


@@ -45,6 +45,11 @@ OPTIONS
        switched to. Any changes to tracked files in the working tree
        since <commit> are lost.
 
        switched to. Any changes to tracked files in the working tree
        since <commit> are lost.
 

+--merge::
+       Resets the index to match the tree recorded by the named commit,
+       and updates the files that are different between the named commit
+       and the current commit in the working tree.
+

 -q::
        Be quiet, only report errors.
 
 -q::
        Be quiet, only report errors.
 


@@ -82,7 +87,9 @@ $ git reset --hard HEAD~3   <1>
 +
 <1> The last three commits (HEAD, HEAD^, and HEAD~2) were bad
 and you do not want to ever see them again.  Do *not* do this if
 +
 <1> The last three commits (HEAD, HEAD^, and HEAD~2) were bad
 and you do not want to ever see them again.  Do *not* do this if

-you have already given these commits to somebody else.
+you have already given these commits to somebody else.  (See the
+"RECOVERING FROM UPSTREAM REBASE" section in linkgit:git-rebase[1] for
+the implications of doing so.)

 
 Undo a commit, making it a topic branch::
 +
 
 Undo a commit, making it a topic branch::
 +


@@ -128,7 +135,7 @@ Undo a merge or pull::
 $ git pull                         <1>
 Auto-merging nitfol
 CONFLICT (content): Merge conflict in nitfol
 $ git pull                         <1>
 Auto-merging nitfol
 CONFLICT (content): Merge conflict in nitfol

-Automatic merge failed/prevented; fix up by hand
+Automatic merge failed; fix conflicts and then commit the result.

 $ git reset --hard                 <2>
 $ git pull . topic/branch          <3>
 Updating from 41223... to 13134...
 $ git reset --hard                 <2>
 $ git pull . topic/branch          <3>
 Updating from 41223... to 13134...


@@ -150,6 +157,28 @@ tip of the current branch in ORIG_HEAD, so resetting hard to it
 brings your index file and the working tree back to that state,
 and resets the tip of the branch to that commit.
 
 brings your index file and the working tree back to that state,
 and resets the tip of the branch to that commit.
 

+Undo a merge or pull inside a dirty work tree::
++
+------------
+$ git pull                         <1>
+Auto-merging nitfol
+Merge made by recursive.
+ nitfol                |   20 +++++----
+ ...
+$ git reset --merge ORIG_HEAD      <2>
+------------
++
+<1> Even if you may have local modifications in your
+working tree, you can safely say "git pull" when you know
+that the change in the other branch does not overlap with
+them.
+<2> After inspecting the result of the merge, you may find
+that the change in the other branch is unsatisfactory.  Running
+"git reset --hard ORIG_HEAD" will let you go back to where you
+were, but it will discard your local changes, which you do not
+want.  "git reset --merge" keeps your local changes.
+
+

 Interrupted workflow::
 +
 Suppose you are interrupted by an urgent fix request while you
 Interrupted workflow::
 +
 Suppose you are interrupted by an urgent fix request while you


@@ -175,6 +204,8 @@ $ git reset                                       <3>
 <3> At this point the index file still has all the WIP changes you
     committed as 'snapshot WIP'.  This updates the index to show your
     WIP files as uncommitted.
 <3> At this point the index file still has all the WIP changes you
     committed as 'snapshot WIP'.  This updates the index to show your
     WIP files as uncommitted.

++
+See also linkgit:git-stash[1].

 
 Reset a single file in the index::
 +
 
 Reset a single file in the index::
 +