Merge branch 'tr/maint-1.6.5-bash-prompt-show-submodule-changes'

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

diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
index abb25d1c00c97144b1f3709e408fe9cad613e623..9df6de2e7dcdfa8f6629e13d5f5768787fccff66 100644 (file)
--- a/Documentation/git-reset.txt
+++ b/Documentation/git-reset.txt
@@ -10,6 +10,7 @@ SYNOPSIS
 [verse]
 'git reset' [--mixed | --soft | --hard | --merge] [-q] [<commit>]
 'git reset' [-q] [<commit>] [--] <paths>...
 [verse]
 'git reset' [--mixed | --soft | --hard | --merge] [-q] [<commit>]
 'git reset' [-q] [<commit>] [--] <paths>...

+'git reset' --patch [<commit>] [--] [<paths>...]

 
 DESCRIPTION
 -----------
 
 DESCRIPTION
 -----------


@@ -23,8 +24,9 @@ the undo in the history.
 If you want to undo a commit other than the latest on a branch,
 linkgit:git-revert[1] is your friend.
 
 If you want to undo a commit other than the latest on a branch,
 linkgit:git-revert[1] is your friend.
 

-The second form with 'paths' is used to revert selected paths in
-the index from a given commit, without moving HEAD.
+The second and third forms with 'paths' and/or --patch are used to
+revert selected paths in the index from a given commit, without moving
+HEAD.

 
 
 OPTIONS
 
 
 OPTIONS


@@ -50,7 +52,17 @@ OPTIONS
        and updates the files that are different between the named commit
        and the current commit in the working tree.
 
        and updates the files that are different between the named commit
        and the current commit in the working tree.
 

+-p::
+--patch::
+       Interactively select hunks in the difference between the index
+       and <commit> (defaults to HEAD).  The chosen hunks are applied
+       in reverse to the index.
++
+This means that `git reset -p` is the opposite of `git add -p` (see
+linkgit:git-add[1]).
+

 -q::
 -q::

+--quiet::

        Be quiet, only report errors.
 
 <commit>::
        Be quiet, only report errors.
 
 <commit>::


@@ -139,7 +151,7 @@ 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...

-Fast forward
+Fast-forward

 $ git reset --hard ORIG_HEAD       <4>
 ------------
 +
 $ git reset --hard ORIG_HEAD       <4>
 ------------
 +


@@ -150,7 +162,7 @@ right now, so you decide to do that later.
 which is a synonym for "git reset --hard HEAD" clears the mess
 from the index file and the working tree.
 <3> Merge a topic branch into the current branch, which resulted
 which is a synonym for "git reset --hard HEAD" clears the mess
 from the index file and the working tree.
 <3> Merge a topic branch into the current branch, which resulted

-in a fast forward.
+in a fast-forward.

 <4> But you decided that the topic branch is not ready for public
 consumption yet.  "pull" or "merge" always leaves the original
 tip of the current branch in ORIG_HEAD, so resetting hard to it
 <4> But you decided that the topic branch is not ready for public
 consumption yet.  "pull" or "merge" always leaves the original
 tip of the current branch in ORIG_HEAD, so resetting hard to it