path: root/Documentation/diff-options.txt
diff options
authorJunio C Hamano <>2018-03-14 19:01:02 (GMT)
committerJunio C Hamano <>2018-03-14 19:01:02 (GMT)
commit868f7d23384931641aa4901aab27f3f23577e63b (patch)
tree148d5d0a8e4e71487fe598c9196b397c40c934f1 /Documentation/diff-options.txt
parentd0db9edba0050ada6f6eac68061599690d2a4333 (diff)
parentddf88fa6166473be15822739e0a12aad4edfbbc5 (diff)
Merge branch 'nd/diff-stat-with-summary'
"git diff" and friends learned "--compact-summary" that shows the information usually given with the "--summary" option on the same line as the diffstat output of the "--stat" option (which saves vertical space and keeps info on a single path at the same place). * nd/diff-stat-with-summary: diff: add --compact-summary diff.c: refactor pprint_rename() to use strbuf
Diffstat (limited to 'Documentation/diff-options.txt')
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index c330c01..e3a44f0 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -128,6 +128,14 @@ have to use `--diff-algorithm=default` option.
These parameters can also be set individually with `--stat-width=<width>`,
`--stat-name-width=<name-width>` and `--stat-count=<count>`.
+ Output a condensed summary of extended header information such
+ as file creations or deletions ("new" or "gone", optionally "+l"
+ if it's a symlink) and mode changes ("+x" or "-x" for adding
+ or removing executable bit respectively) in diffstat. The
+ information is put betwen the filename part and the graph
+ part. Implies `--stat`.
Similar to `--stat`, but shows number of added and
deleted lines in decimal notation and pathname without