diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-04-15 19:35:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-15 19:35:55 -0700 |
| commit | 07512ea820b9161a1f45bb1bcc1bd67d6e1ea74f (patch) | |
| tree | d228eb5f456bd1f5bdae368b223de55038c028f6 /diff.h | |
| parent | Merge branch 'lt/show' into next (diff) | |
| parent | diff-options: add --patch-with-stat (diff) | |
| download | tgif-07512ea820b9161a1f45bb1bcc1bd67d6e1ea74f.tar.xz | |
Merge branch 'js/diffstat' into next
* js/diffstat:
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.
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" \ |