diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-11-02 16:36:40 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-02 16:36:40 -0800 |
| commit | 84cdd3c635280c42ae42009c4be020ef2c30ba7c (patch) | |
| tree | 773c977169a5085ff4a8dfb2dab300503d9ff05b /diffcore.h | |
| parent | 275ee50c819d6c25a303f3d01689aba00840a783 (diff) | |
| parent | a5a323f33cd25829e0dde3939b196cf743d7d9d8 (diff) | |
| download | git-84cdd3c635280c42ae42009c4be020ef2c30ba7c.tar.gz | |
Merge branch 'maint'
* maint:
Add reference for status letters in documentation.
Document that git-log takes --all-match.
Update draft 1.6.0.4 release notes
Diffstat (limited to 'diffcore.h')
| -rw-r--r-- | diffcore.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/diffcore.h b/diffcore.h index 713cca785c..5b634585e8 100644 --- a/diffcore.h +++ b/diffcore.h @@ -62,7 +62,7 @@ struct diff_filepair { struct diff_filespec *one; struct diff_filespec *two; unsigned short int score; - char status; /* M C R N D U (see Documentation/diff-format.txt) */ + char status; /* M C R A D U etc. (see Documentation/diff-format.txt or DIFF_STATUS_* in diff.h) */ unsigned broken_pair : 1; unsigned renamed_pair : 1; unsigned is_unmerged : 1; |