projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean mail files after dealing with them.
[git.git]
/
diff.h
diff --git
a/diff.h
b/diff.h
index
2e32870
..
2f4a7b4
100644
(file)
--- a/
diff.h
+++ b/
diff.h
@@
-67,6
+67,7
@@
extern void diffcore_std_no_resolve(struct diff_options *);
" -p output patch format.\n" \
" -u synonym for -p.\n" \
" --name-only show only names of changed files.\n" \
" -p output patch format.\n" \
" -u synonym for -p.\n" \
" --name-only show only names of changed files.\n" \
+" --name-status show names and status of changed files.\n" \
" -R swap input file pairs.\n" \
" -B detect complete rewrites.\n" \
" -M detect renames.\n" \
" -R swap input file pairs.\n" \
" -B detect complete rewrites.\n" \
" -M detect renames.\n" \
@@
-85,6
+86,7
@@
extern int diff_queue_is_empty(void);
#define DIFF_FORMAT_PATCH 2
#define DIFF_FORMAT_NO_OUTPUT 3
#define DIFF_FORMAT_NAME 4
#define DIFF_FORMAT_PATCH 2
#define DIFF_FORMAT_NO_OUTPUT 3
#define DIFF_FORMAT_NAME 4
+#define DIFF_FORMAT_NAME_STATUS 5
extern void diff_flush(struct diff_options*);
extern void diff_flush(struct diff_options*);
@@
-101,7
+103,7
@@
extern void diff_flush(struct diff_options*);
/* these are not diff-raw status letters proper, but used by
* diffcore-filter insn to specify additional restrictions.
*/
/* these are not diff-raw status letters proper, but used by
* diffcore-filter insn to specify additional restrictions.
*/
-#define DIFF_STATUS_FILTER_AON '
A
'
+#define DIFF_STATUS_FILTER_AON '
*
'
#define DIFF_STATUS_FILTER_BROKEN 'B'
#endif /* DIFF_H */
#define DIFF_STATUS_FILTER_BROKEN 'B'
#endif /* DIFF_H */