diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-05-27 15:54:37 -0700 |
|---|---|---|
| committer |  Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-29 11:17:43 -0700 |
| commit | 19feebc8c3ca7bd40f2f32f4f856b68b9a02870c (patch) | |
| tree | e536ae939c90a8ce9c1278f6134ce5b6d1a72774 /diff.h | |
| parent | [PATCH] Remove final newline from the value of xfrm_msg variable. (diff) | |
| download | tgif-19feebc8c3ca7bd40f2f32f4f856b68b9a02870c.tar.xz | |
[PATCH] Clean up diff_setup() to make it more extensible.
This changes the argument of diff_setup() from an integer that
says if we are feeding reversed diff to a bitmask, so that later
global options can be added more easily.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'diff.h')
| -rw-r--r-- | diff.h | 12 |
1 files changed, 7 insertions, 5 deletions
@@ -28,11 +28,8 @@ extern void diff_unmerge(const char *path); extern int diff_scoreopt_parse(const char *opt); -#define DIFF_FORMAT_HUMAN 0 -#define DIFF_FORMAT_MACHINE 1 -#define DIFF_FORMAT_PATCH 2 -#define DIFF_FORMAT_NO_OUTPUT 3 -extern void diff_setup(int reverse); +#define DIFF_SETUP_REVERSE 1 +extern void diff_setup(int flags); #define DIFF_DETECT_RENAME 1 #define DIFF_DETECT_COPY 2 @@ -44,6 +41,11 @@ extern void diffcore_pathspec(const char **pathspec); extern int diff_queue_is_empty(void); +#define DIFF_FORMAT_HUMAN 0 +#define DIFF_FORMAT_MACHINE 1 +#define DIFF_FORMAT_PATCH 2 +#define DIFF_FORMAT_NO_OUTPUT 3 + extern void diff_flush(int output_style, int resolve_rename_copy); #endif /* DIFF_H */ |