diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-06-04 00:01:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-04 00:01:52 -0700 |
| commit | f63237a18e951b93ac46a0e594f286255e1eaaaf (patch) | |
| tree | a131e9466bc5ca7ca42e31e71274ce3152dc8615 /Documentation/git-reset.txt | |
| parent | Merge branch 'jc/fmt-patch' into next (diff) | |
| parent | Cleanup git-send-email.perl:extract_valid_email (diff) | |
| download | tgif-f63237a18e951b93ac46a0e594f286255e1eaaaf.tar.xz | |
Merge branch 'vb/sendemail' into next
* vb/sendemail:
Cleanup git-send-email.perl:extract_valid_email
read-tree --reset: update working tree file for conflicted paths.
Documentation: Spelling fixes
Builtin git-rev-parse.
fetch: do not report "same" unless -verbose.
Diffstat (limited to 'Documentation/git-reset.txt')
| -rw-r--r-- | Documentation/git-reset.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt index b27399dd41..73a0ffc410 100644 --- a/Documentation/git-reset.txt +++ b/Documentation/git-reset.txt @@ -24,7 +24,7 @@ gitlink:git-revert[1] is your friend. OPTIONS ------- --mixed:: - Resets the index but not the working tree (ie, the changed files + Resets the index but not the working tree (i.e., the changed files are preserved but not marked for commit) and reports what has not been updated. This is the default action. |