From: Junio C Hamano Date: Wed, 10 May 2006 00:13:44 +0000 (+0000) Subject: Autogenerated man pages for v1.3.2-g8c24 X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=35aaa6435e3a653e4eb4bbbceb2f67227839daea;p=git.git Autogenerated man pages for v1.3.2-g8c24 --- diff --git a/man1/git-clean.1 b/man1/git-clean.1 index ad7789a1..5a5eceaf 100755 --- a/man1/git-clean.1 +++ b/man1/git-clean.1 @@ -23,13 +23,13 @@ git-clean \- Remove untracked files from the working tree .SH "SYNOPSIS" .nf -\fIgit\-clean\fR [\-d] [\-n] [\-q] [\-x | \-X] +\fIgit\-clean\fR [\-d] [\-n] [\-q] [\-x | \-X] [\-\-] ... .fi .SH "DESCRIPTION" -Removes files unknown to git\&. This allows to clean the working tree from files that are not under version control\&. If the \fI\-x\fR option is specified, ignored files are also removed, allowing to remove all build products\&. +Removes files unknown to git\&. This allows to clean the working tree from files that are not under version control\&. If the \fI\-x\fR option is specified, ignored files are also removed, allowing to remove all build products\&. When optional ... arguments are given, the paths affected are further limited to those that match them\&. .SH "OPTIONS" diff --git a/man1/git-update-index.1 b/man1/git-update-index.1 index 10a1d1f4..b5cc1d49 100755 --- a/man1/git-update-index.1 +++ b/man1/git-update-index.1 @@ -29,7 +29,7 @@ git-update-index \- Modifies the index or directory cache [\-\-cacheinfo ]* [\-\-chmod=(+|\-)x] [\-\-assume\-unchanged | \-\-no\-assume\-unchanged] - [\-\-really\-refresh] [\-\-unresolve] + [\-\-really\-refresh] [\-\-unresolve] [\-\-again] [\-\-info\-only] [\-\-index\-info] [\-z] [\-\-stdin] [\-\-verbose] @@ -87,6 +87,10 @@ Set the execute permissions on the updated files\&. When these flags are specified, the object name recorded for the paths are not updated\&. Instead, these options sets and unsets the "assume unchanged" bit for the paths\&. When the "assume unchanged" bit is on, git stops checking the working tree files for possible modifications, so you need to manually unset the bit to tell git when you change the working tree file\&. This is sometimes helpful when working with a big project on a filesystem that has very slow lstat(2) system call (e\&.g\&. cifs)\&. .TP +\-\-again +Runs git\-update\-index itself on the paths whose index entries are different from those from the HEAD commit\&. + +.TP \-\-unresolve Restores the \fIunmerged\fR or \fIneeds updating\fR state of a file during a merge if it was cleared by accident\&.