projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Document a couple of missing command-line options.
[git.git]
/
diff-tree.c
diff --git
a/diff-tree.c
b/diff-tree.c
index
ed323d8
..
09d16ad
100644
(file)
--- a/
diff-tree.c
+++ b/
diff-tree.c
@@
-3,6
+3,7
@@
#include "commit.h"
static int show_root_diff = 0;
#include "commit.h"
static int show_root_diff = 0;
+static int no_commit_id = 0;
static int verbose_header = 0;
static int ignore_merges = 1;
static int read_stdin = 0;
static int verbose_header = 0;
static int ignore_merges = 1;
static int read_stdin = 0;
@@
-29,7
+30,8
@@
static int call_diff_flush(void)
return 0;
}
if (header) {
return 0;
}
if (header) {
- printf("%s%c", header, diff_options.line_termination);
+ if (!no_commit_id)
+ printf("%s%c", header, diff_options.line_termination);
header = NULL;
}
diff_flush(&diff_options);
header = NULL;
}
diff_flush(&diff_options);
@@
-231,6
+233,10
@@
int main(int argc, const char **argv)
show_root_diff = 1;
continue;
}
show_root_diff = 1;
continue;
}
+ if (!strcmp(arg, "--no-commit-id")) {
+ no_commit_id = 1;
+ continue;
+ }
usage(diff_tree_usage);
}
if (diff_options.output_format == DIFF_FORMAT_PATCH)
usage(diff_tree_usage);
}
if (diff_options.output_format == DIFF_FORMAT_PATCH)