diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-09-14 18:23:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-09-14 18:23:01 -0700 |
| commit | 04222b245c5e0d49242ef1ca995fadd5fa082cd3 (patch) | |
| tree | d5206956b63447b10781bb899597f0f38c632a8b /Documentation | |
| parent | f6336167e9f233d3a68c8ded18b172ba50cde743 (diff) | |
| parent | a7a0f3d3f858eef1f1326821343c640c5b3838ce (diff) | |
| download | git-04222b245c5e0d49242ef1ca995fadd5fa082cd3.tar.gz | |
Merge branch 'jc/partial-remove'
* jc/partial-remove:
Document ls-files --with-tree=<tree-ish>
git-commit: partial commit of paths only removed from the index
git-commit: Allow partial commit of file removal.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-ls-files.txt | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt index 997594549f..9e454f0a4d 100644 --- a/Documentation/git-ls-files.txt +++ b/Documentation/git-ls-files.txt @@ -15,7 +15,7 @@ SYNOPSIS [-x <pattern>|--exclude=<pattern>] [-X <file>|--exclude-from=<file>] [--exclude-per-directory=<file>] - [--error-unmatch] + [--error-unmatch] [--with-tree=<tree-ish>] [--full-name] [--abbrev] [--] [<file>]\* DESCRIPTION @@ -81,6 +81,13 @@ OPTIONS If any <file> does not appear in the index, treat this as an error (return 1). +--with-tree=<tree-ish>:: + When using --error-unmatch to expand the user supplied + <file> (i.e. path pattern) arguments to paths, pretend + that paths which were removed in the index since the + named <tree-ish> are still present. Using this option + with `-s` or `-u` options does not make any sense. + -t:: Identify the file status with the following tags (followed by a space) at the start of each line: |