diff options
| author | Michael J Gruber <git@drmicha.warpmail.net> | 2010-09-15 22:47:39 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-18 15:14:10 -0700 |
| commit | ae8285ed63b9cca3324fda6481b2a97a92e3e50d (patch) | |
| tree | a730b687d0db9082f0e006f8c2214094ff43bc6f /Documentation/git-reset.txt | |
| parent | e22148f406a7a31a25ebda01d21d9a4646ce82ea (diff) | |
| download | git-ae8285ed63b9cca3324fda6481b2a97a92e3e50d.tar.gz | |
git-reset.txt: clarify branch vs. branch head
"Change the branch" can be misunderstood to mean "change which branch is
checked out". Make it clearer that git-reset changes the branch head of
the currently checked out branch.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-reset.txt')
| -rw-r--r-- | Documentation/git-reset.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt index 9cf31485fe..91bd2e90ec 100644 --- a/Documentation/git-reset.txt +++ b/Documentation/git-reset.txt @@ -15,7 +15,7 @@ SYNOPSIS DESCRIPTION ----------- In the first and second form, copy entries from <commit> to the index. -In the third form, set the current branch to <commit>, optionally +In the third form, set the current branch head to <commit>, optionally modifying index and worktree to match. The <commit> defaults to HEAD in all forms. @@ -36,7 +36,7 @@ This means that `git reset -p` is the opposite of `git add -p` (see linkgit:git-add[1]). 'git reset' [--<mode>] [<commit>]:: - This form points the current branch to <commit> and then + This form resets the current branch head to <commit> and then updates index and working tree according to <mode>, which must be one of the following: + |