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-update-index.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-update-index.txt')
| -rw-r--r-- | Documentation/git-update-index.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt index d043e86a77..3ae6e74573 100644 --- a/Documentation/git-update-index.txt +++ b/Documentation/git-update-index.txt @@ -40,7 +40,7 @@ OPTIONS --remove:: If a specified file is in the index but is missing then it's removed. - Default behaviour is to ignore removed file. + Default behavior is to ignore removed file. --refresh:: Looks at the current index and checks to see if merges or |