From: Junio C Hamano Date: Wed, 6 Jul 2011 23:48:59 +0000 (-0700) Subject: Merge branch 'maint' X-Git-Tag: v1.7.7-rc0~111 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/395f65d438b13fb1fded88a330dc06c3b0951046?ds=inline;hp=-c Merge branch 'maint' * maint: docs: document --textconv diff option --- 395f65d438b13fb1fded88a330dc06c3b0951046 diff --combined Documentation/diff-options.txt index 4235302ea4,659de6f123..b620b3afec --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@@ -48,17 -48,11 +48,17 @@@ endif::git-format-patch[ --patience:: Generate a diff using the "patience diff" algorithm. ---stat[=[,]]:: +--stat[=[,[,]]]:: Generate a diffstat. You can override the default output width for 80-column terminal by `--stat=`. The width of the filename part can be controlled by giving another width to it separated by a comma. + By giving a third parameter ``, you can limit the + output to the first `` lines, followed by + `...` if there are more. ++ +These parameters can also be set individually with `--stat-width=`, +`--stat-name-width=` and `--stat-count=`. --numstat:: Similar to `\--stat`, but shows number of added and @@@ -422,6 -416,17 +422,17 @@@ endif::git-format-patch[ --no-ext-diff:: Disallow external diff drivers. + --textconv:: + --no-textconv:: + Allow (or disallow) external text conversion filters to be run + when comparing binary files. See linkgit:gitattributes[5] for + details. Because textconv filters are typically a one-way + conversion, the resulting diff is suitable for human + consumption, but cannot be applied. For this reason, textconv + filters are enabled by default only for linkgit:git-diff[1] and + linkgit:git-log[1], but not for linkgit:git-format-patch[1] or + diff plumbing commands. + --ignore-submodules[=]:: Ignore changes to submodules in the diff generation. can be either "none", "untracked", "dirty" or "all", which is the default