diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-04-16 02:31:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-16 02:31:11 -0700 |
| commit | b2934926dd7455de61577c1dfdf4c12d224e7ae0 (patch) | |
| tree | 88e571dc7678ab392fe9c3bc6f3b986011ad257e /diff.h | |
| parent | ba1d45051e050cbcf68ccccacea86a4b6ecde731 (diff) | |
| parent | 402461aab17292b78bd36a17bff18e48d544cc9a (diff) | |
| download | git-b2934926dd7455de61577c1dfdf4c12d224e7ae0.tar.gz | |
Merge branch 'master' into lt/logopt
* master:
pager: do not fork a pager if PAGER is set to empty.
diff-options: add --patch-with-stat
diff-files --stat: do not dump core with unmerged index.
Support "git cmd --help" syntax
diff --stat: do not do its own three-dashes.
diff-tree: typefix.
GIT v1.3.0-rc4
xdiff: post-process hunks to make them consistent.
Diffstat (limited to 'diff.h')
| -rw-r--r-- | diff.h | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -25,6 +25,7 @@ struct diff_options { const char *pickaxe; unsigned recursive:1, with_raw:1, + with_stat:1, tree_in_recursive:1, full_index:1; int break_opt; @@ -120,6 +121,8 @@ extern void diffcore_std_no_resolve(struct diff_options *); " --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" \ |