projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update the documentation for git-merge-base
[git.git]
/
diff.h
diff --git
a/diff.h
b/diff.h
index
cc7cc62
..
f783bae
100644
(file)
--- a/
diff.h
+++ b/
diff.h
@@
-24,6
+24,8
@@
struct diff_options {
const char *orderfile;
const char *pickaxe;
unsigned recursive:1,
const char *orderfile;
const char *pickaxe;
unsigned recursive:1,
+ with_raw:1,
+ with_stat:1,
tree_in_recursive:1,
full_index:1;
int break_opt;
tree_in_recursive:1,
full_index:1;
int break_opt;
@@
-116,6
+118,11
@@
extern void diffcore_std_no_resolve(struct diff_options *);
" -z output diff-raw with lines terminated with NUL.\n" \
" -p output patch format.\n" \
" -u synonym for -p.\n" \
" -z output diff-raw with lines terminated with NUL.\n" \
" -p output patch format.\n" \
" -u synonym for -p.\n" \
+" --patch-with-raw\n" \
+" output both a patch and the diff-raw format.\n" \
+" --stat show diffstat instead of patch.\n" \
+" --patch-with-stat\n" \
+" output a patch and prepend its diffstat.\n" \
" --name-only show only names of changed files.\n" \
" --name-status show names and status of changed files.\n" \
" --full-index show full object name on index lines.\n" \
" --name-only show only names of changed files.\n" \
" --name-status show names and status of changed files.\n" \
" --full-index show full object name on index lines.\n" \
@@
-139,6
+146,7
@@
extern int diff_queue_is_empty(void);
#define DIFF_FORMAT_NO_OUTPUT 3
#define DIFF_FORMAT_NAME 4
#define DIFF_FORMAT_NAME_STATUS 5
#define DIFF_FORMAT_NO_OUTPUT 3
#define DIFF_FORMAT_NAME 4
#define DIFF_FORMAT_NAME_STATUS 5
+#define DIFF_FORMAT_DIFFSTAT 6
extern void diff_flush(struct diff_options*);
extern void diff_flush(struct diff_options*);