diff options
| author | Yann Dirson <ydirson@altern.org> | 2008-11-02 14:37:28 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-02 15:57:10 -0800 |
| commit | a5a323f33cd25829e0dde3939b196cf743d7d9d8 (patch) | |
| tree | fcab3161b7077c7897f35fb7d0c512fd6c8694c9 /diffcore.h | |
| parent | 7756ba74c04caf03d47718d581439a48bae7ed73 (diff) | |
| download | git-a5a323f33cd25829e0dde3939b196cf743d7d9d8.tar.gz git-a5a323f33cd25829e0dde3939b196cf743d7d9d8.tar.xz | |
Add reference for status letters in documentation.
Also fix error in diff_filepair::status documentation, and point to
the in-code reference as well as the doc.
Signed-off-by: Yann Dirson <ydirson@altern.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 8ae35785f..1ebfdae8b 100644 --- a/diffcore.h +++ b/diffcore.h @@ -58,7 +58,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; |