verbose Output extra information about the work being done. s - quiet - silent Work silently unless an error occurs. f - force Like -t, but ignore bad - Prereq patches, and assume unreversed. Miscellaneous options: -t - batch Ask no questions skip bad-Prereq patches assume reversed. g NUM - get = NUM Get files from RCS etc. z SUFFIX - suffix = SUFFIX Append SUFFIX to backup file names. Y PREFIX - basename - prefix = PREFIX Prepend PREFIX to backup file basenames. B PREFIX - prefix = PREFIX Prepend PREFIX to backup file names. STYLE is either ' simple ', ' numbered ', or ' existing '. V STYLE - version - control = STYLE Use STYLE version control. no - backup - if - mismatch Back up mismatches only if otherwise requested. backup - if - mismatch Back up if the patch does not match exactly. Backup and version control options: -b - backup Back up the original contents of each file. Default is taken from QUOTING_STYLE env variable, or ' shell ' if unset.
Valid WORDs are: literal, shell, shell - always, c, escape. quoting - style = WORD output file names using quoting style WORD. T - set - time Likewise, assuming local time. Z - set - utc Set times of patched files, assuming diff uses UTC ( GMT ). E - remove - empty - files Remove output files that are empty after patching. D NAME - ifdef = NAME Make merged if - then - else output using NAME. r FILE - reject - file = FILE Output rejects to FILE. Output options: -o FILE - output = FILE Output patched files to FILE. i PATCHFILE - input = PATCHFILE Read patch from PATCHFILE instead of stdin. R - reverse Assume patches were created with old and new files swapped. N - forward Ignore patches that appear to be reversed or already applied. u - unified Interpret the patch as a unified difference. n - normal Interpret the patch as a normal difference. e - ed Interpret the patch as an ed script.
c - context Interpret the patch as a context difference. l - ignore - whitespace Ignore white space changes between patch and input. F LINES - fuzz LINES Set the fuzz factor to LINES for inexact matching. ] Input options: -p NUM - strip = NUM Strip NUM leading components from file names. Usage : C:\ Program Files \ WinMerge \ GnuWin32 \ bin \ patch.
0 kommentar(er)
