From: Duy Nguyen Date: Wed, 12 Dec 2018 19:46:58 GMT Subject: review "git range-diff -h" output Message-ID: <20181212194658.GA25117@duynguyen.home> I'm not going to bother you with patches (yet) but I could use a few eyeballs to check the help usage (and perhaps the option grouping) for commands that take diff options. Forget about hiding irrelevant options for this particular command for now. This is something we can do later. usage: git range-diff [] .. .. or: git range-diff [] ... or: git range-diff [] --creation-factor Percentage by which creation is weighted --no-dual-color use simple diff colors Diff output format options -p, --patch generate patch -s, --no-patch suppress diff output -u generate patch -U, --unified generate diffs with lines context -W, --function-context generate diffs with lines context --raw generate the diff in raw format --patch-with-raw synonym for '-p --raw' --patch-with-stat synonym for '-p --stat' --numstat machine friendly --stat --shortstat output only the last line of --stat -X, --dirstat[=...] output the distribution of relative amount of changes for each sub-directory --cumulative synonym for --dirstat=cumulative --dirstat-by-file[=...] synonym for --dirstat=files,param1,param2... --check warn if changes introduce conflict markers or whitespace errors --summary condensed summary such as creations, renames and mode changes --name-only show only names of changed files --name-status show only names and status of changed files --stat[=[,[,]]] generate diffstat --stat-width generate diffstat with a given width --stat-name-width generate diffstat with a given name width --stat-graph-width generate diffstat with a given graph width --stat-count generate diffstat with limited lines --compact-summary generate compact summary in diffstat --binary output a binary diff that can be applied --full-index show full pre- and post-image object names on the "index" lines --color[=] show colored diff --ws-error-highlight highlight whitespaces errors in the context, old or new lines in the diff -z do not munge pathnames and use NULs as output field terminators in --raw or --numstat --abbrev[=] use digits to display SHA-1s --src-prefix show the given source prefix instead of "a/" --dst-prefix show the given source prefix instead of "b/" --line-prefix prepend an additional prefix to every line of output --no-prefix no not show any source or destination prefix --inter-hunk-context show context between diff hunks up to the specified number of lines --output-indicator-new specify the character to indicate a new line instead of '+' --output-indicator-old specify the character to indicate an old line instead of '-' --output-indicator-context specify the character to indicate a context instead of ' ' Diff rename options -B, --break-rewrites[=[/]] break complete rewrite changes into pairs of delete and create -M, --find-renames[=] detect renames -D, --irreversible-delete omit the preimage for deletes -C, --find-copies[=] detect copies --find-copies-harder use unmodified files as source to find copies --no-renames disable rename detection --rename-empty use empty blobs as rename source --follow continue listing the history of a file beyond renames -l prevent rename/copy detection if the number of rename/copy targets exceeds given limit Diff algorithm options --minimal produce the smallest possible diff -w, --ignore-all-space ignore whitespace when comparing lines -b, --ignore-space-change ignore changes in amount of whitespace --ignore-space-at-eol ignore changes in whitespace at EOL --ignore-cr-at-eol ignore carrier-return at the end of line --ignore-blank-lines ignore changes whose lines are all blank --indent-heuristic heuristic to shift diff hunk boundaries for easy reading --patience generate diff using the "patience diff" algorithm --histogram generate diff using the "histogram diff" algorithm --diff-algorithm choose a diff algorithm --anchored generate diff using the "anchored diff" algorithm --word-diff[=] show word diff, using to delimit changed words --word-diff-regex use to decide what a word is --color-words[=] equivalent to --word-diff=color --word-diff-regex= --color-moved[=] move lines of code are colored differently --color-moved-ws how white spaces are ignored in --color-moved Diff other options --relative[=] when run from subdir, exclude changes outside and show relative paths -a, --text treat all files as text -R swap two inputs, reverse the diff --exit-code exit with 1 if there were differences, 0 otherwise --quiet disable all output of the program --ext-diff allow an external diff helper to be executed --textconv run external text conversion filters when comparing binary files --ignore-submodules[=] ignore changes to submodules in the diff generation --submodule[=] specify how differences in submodules are shown --ita-invisible-in-index hide 'git add -N' entries from the index --ita-visible-in-index treat 'git add -N' entries as real in the index -S look for differences that change the number of occurrences of the specified string -G look for differences that change the number of occurrences of the specified regex --pickaxe-all show all changes in the changeset with -S or -G --pickaxe-regex treat in -S as extended POSIX regular expression -O override diff.orderFile configuration variable --find-object look for differences that change the number of occurrences of the specified object --diff-filter [(A|C|D|M|R|T|U|X|B)...[*]] select files by diff type --output Output to a specific file