Mercurial > hgsubversion
Help: qdiff
hg qdiff [OPTION]... [FILE]...
diff of the current patch and subsequent modifications
Shows a diff which includes the current patch as well as any changes which have been made in the working directory since the last refresh (thus showing what the current patch would become after a qrefresh).
Use 'hg diff' if you only want to see the changes made since the last qrefresh, or 'hg export qtip' if you want to see changes made by the current patch without including changes made since the qrefresh.
Returns 0 on success.
options ([+] can be repeated):
-a | --text | treat all files as text |
-g | --[no-]git | use git extended diff format (default: on from config) |
--binary | generate binary diffs in git mode (default) | |
--nodates | omit dates from diff headers | |
--noprefix | omit a/ and b/ prefixes from filenames | |
-p | --[no-]show-function | show which function each change is in (default: on from config) |
--reverse | produce a diff that undoes the changes | |
-w | --ignore-all-space | ignore white space when comparing lines |
-b | --ignore-space-change | ignore changes in the amount of white space |
-B | --ignore-blank-lines | ignore changes whose lines are all blank |
-Z | --ignore-space-at-eol | ignore changes in whitespace at EOL |
-U | --unified NUM | number of lines of context to show |
--stat | output diffstat-style summary of changes | |
--root DIR | produce diffs relative to subdirectory | |
-I | --include PATTERN [+] | include names matching the given patterns |
-X | --exclude PATTERN [+] | exclude names matching the given patterns |
global options ([+] can be repeated):
-R | --repository REPO | repository root directory or name of overlay bundle file |
--cwd DIR | change working directory | |
-y | --noninteractive | do not prompt, automatically pick the first choice for all prompts |
-q | --quiet | suppress output |
-v | --verbose | enable additional output |
--color TYPE | when to colorize (boolean, always, auto, never, or debug) | |
--config CONFIG [+] | set/override config option (use 'section.name=value') | |
--debug | enable debugging output | |
--debugger | start debugger | |
--encoding ENCODE | set the charset encoding (default: UTF-8) | |
--encodingmode MODE | set the charset encoding mode (default: strict) | |
--traceback | always print a traceback on exception | |
--time | time how long the command takes | |
--profile | print command execution profile | |
--version | output version information and exit | |
-h | --help | display help and exit |
--hidden | consider hidden changesets | |
--pager TYPE | when to paginate (boolean, always, auto, or never) (default: auto) |