diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-04-22 23:37:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-04-22 23:37:06 -0700 |
| commit | d6958a1a32814af69a7571daa45252018c61f969 (patch) | |
| tree | 355fe5cdd4749e67d8979f80f7dcdc649b9aba41 /Documentation | |
| parent | 491b1b11213c373a3e91004b1ab775d7e52ac1f3 (diff) | |
| parent | 4f7ec7970874d09be162bc7f16415a0ec2d36ae5 (diff) | |
| download | git-d6958a1a32814af69a7571daa45252018c61f969.tar.gz | |
Merge branch 'maint-1.5.4' into maint
* maint-1.5.4:
svn-git: Use binmode for reading/writing binary rev maps
diff options documentation: refer to --diff-filter in --name-status
git-svn bug with blank commits and author file
archive.c: format_subst - fixed bogus argument to memchr
copy.c: copy_fd - correctly report write errors
gitattributes: Fix subdirectory attributes specified from root directory
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/diff-options.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 01e7a57851..13234fa280 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -83,7 +83,8 @@ endif::git-format-patch[] Show only names of changed files. --name-status:: - Show only names and status of changed files. + Show only names and status of changed files. See the description + of the `--diff-filter` option on what the status letters mean. --color:: Show colored diff. |