Mercurial > hg > octave-shane
Help: pdiff
hg pdiff
show diff combining committed and uncommited changes
This show the combined diff of the current working copy parent commit and the uncommitted change in the working copy itself. The diff displayed match the content of the commit that a bare 'hg amend' will creates.
See 'hg help diff' for details.
options ([+] can be repeated):
-c | --change REV | change made by revision |
-a | --text | treat all files as text |
-g | --git | use git extended diff format |
--binary | generate binary diffs in git mode (default) | |
--nodates | omit dates from diff headers | |
--noprefix | omit a/ and b/ prefixes from filenames | |
-p | --show-function | show which function each change is in |
--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 |
-S | --subrepos | recurse into subrepositories |
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) |