.\" patch man page
.de Id
.ds Dt \\$4
..
.Id $Id: patch.1,v 1.4 2005/08/08 15:02:43 jm Exp $
.ds = \-\^\-
.de Sp
.if t .sp .3
.if n .sp
..
.\"
.\" Japanese Version Copyright (C) 2005 Suzuki Takashi
.\"         all rights reserved.
.\" Translated Sat Jun 18 13:10:39 JST 2005
.\"         by Suzuki Takashi <JM@linux.or.jp>.
.\"
.\"WORD:        context diff    ƥ diff (context, unifiedΤȤ)
.\"WORD:        normal diff     Ρޥ diff
.\"WORD:        diff            ʬ, diff
.\"WORD:        diff list       ʬꥹ
.\"WORD:        diff listing    ʬꥹ
.\"WORD:        patched         ѥåä
.\"WORD:        hunk            , hunk
.\"WORD:        fuzz factor     ۣٹ礤, fuzz factor
.\"WORD:        reject          Ѳ, reject
.\"WORD:        simple backup   ʰץХåå
.\"
.TH PATCH 1 \*(Dt GNU
.ta 3n
.SH "̾"
patch \- ꥸʥե˺ʬեŬѤ
.SH ""
.B patch
.RI [ options ]
.RI [ originalfile
.RI [ patchfile ]]
.Sp
̾Ϥäȴñ
.Sp
.BI "patch \-p" "num"
.BI < patchfile
.SH ""
.B patch
ϡץ
.B diff
줿ʬꥹȤޤѥåե
.I patchfile
˼ꡢ
1 ĤޤʣΥꥸʥեˤκʬŬѤ
ѥåäС롣
̾ꥸʥե
ѥåäС֤롣
Хååפ뤳ȤǤ (
.B \-b
ޤ
.B \*=backup
ץ򻲾 ) 
̾ѥåƤե̾ϥѥåե뤫롣
ѥåե뤬 1 Ĥξ硢
.I orginalfile
Ȥƥޥɥ饤ǻꤹ뤳ȤǤ롣
.PP
¹Ԥȡ patch Ϻʬ (diff) ꥹȤηȽ̤롣

\fB\-c\fP (\fB\*=context\fP),
\fB\-e\fP (\fB\*=ed\fP),
\fB\-n\fP (\fB\*=normal\fP),
\fB\-u\fP (\fB\*=unified\fP)
ץΤɤ줫ꤵ줿硢ưȽ̤ϹԤʤʤ
ƥ diff (old-style, new-style, unified) 
Ρޥ diff 
.B patch
ץ༫ȤѥåŬѤ롣
äݤ
.B ed
diff ϥѥפ̤
.BR ed (1)
ǥήޤǤ롣
.PP
.B patch
Ϻʬˤ르ߤɤФʬŬѤ
Ƹˤ르ߤɤФȤ롣
ΤᡢʬꥹȤޤ൭å
.B patch
ήळȤǤưϤǤ롣
diff Τ̥ǥȤƤ䡢
ƥ diff  \s-1CRLF\s0 ǽԤޤǤ硢
󥿡ͥå RFC 934 ǵꤵ褦
"\fB\-\fP" ǻϤޤԤƬ
1ĤޤʣĤ "\fB\- \fP" դƤˤϡ
Ϲθ롣
.PP
ƥ diff 
Ρޥ diff ( Ρޥ diff ξŬϰϤϤ䶹 ) ξ硢
.B patch
ϥѥåιֹθ򸡽Ф뤳ȤǤ
ѥåΤ줾β (hunk) ˤĤơ֤򸫤Ĥ褦Ȥ롣
ǽϡhunk ˽񤫤줿ֹ
ľ hunk ŬѤݤΥեåȤø֤ǤϤʤȿ¬롣
⤷줬֤ǤϤʤ硢
.B patch
 hunk ΥƥȤ˰פԤˤʤõ
ޤ
.B patch
ϥƥȤΤ٤ƤιԤפ֤õ
Τ褦ʰ֤Ĥʤǡĥƥ diff Ǥꡢ
 fuzz factor (ۣٹ礤) κͤ 1 ʾξ硢
ƥȤκǽȺǸιԤ̵뤷Ƥ⤦õ
⼺Ԥ fuzz factor κͤ 2 ʾξ硢
ƥȤκǽȺǸ 2 ԤĤ̵뤷Ƥ⤦õ
( ǥեȤ fuzz factor κͤ 2 Ǥ롣 )
.B patch
ϡѥåΤ hunk ŬѤ֤򸫤Ĥʤ硢
 hunk  reject (Ѳ) ե˽񤭽Ф
̾ reject ե̾Ͻϥեθ
.B \&.rej
դΤ
.B \&.rej
դȥե̾Ĺʤꤹˤ
.B #
դΤȤʤ
( ⤷
.B #
1 ʸդƤĹʤꤹˤϡ
ե̾κǸʸ
.B #
֤ ) 
( reject (Ѳ) 줿 hunk Ϥ줿ѥåηˤ餺
̾Υƥ diff ηǽϤ롣
ϤΡޥ diff ξ硢ƥȤ¿ñ˶ˤʤ롣 )
reject ե hunk դ줿ֹϥѥåեΤΤȤ
ۤʤ뤫⤷ʤ
reject եιֹϡŤեˤ֤ǤϤʤ
.B patch
ե hunk Ȼפ褽ΰ֤ˤʤäƤ롣
.PP
줾 hunk νȡ
hunk Ԥɤ䡢
⤷Ԥ硢
.B patch
 ( ե ) ɤιԤ
 hunk ȻפäΤ롣
hunk  diff ˼줿ֹȰۤʤ֤ŬѤ줿ϡ
ΥեåȤΤ롣
礭ʥեåȤ 1 ĤΤ줿硢
 hunk ְä֤ŬѤ줿
.IR ⤷ʤ 
פ֤õ fuzz factor Ȥ줿ɤΤ뤬
ξˤϾԿ˻פäۤ褤
.B \*=verbose
ץꤹȡ hunk ԤäפˤΤ롣
.PP
ޥɥ饤ǥꥸʥե
.I origfile
ꤵʤä硢
.B patch
 diff ˤ르ߤ鼡Τ褦ʵ§Ȥä
Խ٤եȽ̤褦Ȥ롣
.LP
ޤ
.B patch
ϸȤʤե̾νդꥹȤ򼡤Τ褦ˤƺ:
.TP 3
.B " \(bu"
إåƥ diff ΤΤǤ硢
.B patch
ϥإåˤ뿷Υե̾Ȥ
.BI \-p num
ޤ
.BI \*=strip= num
ץ˸äΥå夬ʤե̵̾뤵롣
.B /dev/null
Ȥե̵̾뤵롣
.TP
.B " \(bu"
diff Υߤ
.B Index:\&
ꡢξΥե̾ʤ
.B patch
 \s-1POSIX\s0 ˽򤷤Ƥ硢
.B patch

.B Index:\&
ιԤˤե̾Ȥ
.TP
.B " \(bu"
ʲΥ롼¸뤿ˡ
إå˸줿˴طʤ
Ȥʤե̾ϡ졢 index νǰ롣
.LP

.B patch
ϸꥹȤ鼡Τ褦˥ե̾򤹤:
.TP 3
.B " \(bu"
ʣ̾Υե뤬Ĥä硢
.B patch
 \s-1POSIX\s0 ʤкǽ̾
ǤʤкŬ (best) ̾򤹤롣
.TP
.B " \(bu"
.B patch
 \s-1RCS\s0, ClearCase, \s-1SCCS\s0 ̵뤷ʤ (
.BI "\-g\ " num
ޤ
.BI \*=get= num
ץ򻲾 ) ǡĸꥹȤ̾ΥեϤɤ¸ߤʤ
\s-1RCS\s0, ClearCase, \s-1SCCS\s0 ޥĤä硢
.B patch
 \s-1RCS\s0, ClearCase, \s-1SCCS\s0 ޥ¸ߤ
ꥹκǽ̾Υե򤹤롣
.TP
.B " \(bu"
ꥹȤ̾Υե뤬ɤ¸ߤ
\s-1RCS\s0, ClearCase, \s-1SCCS\s0 ޥ⸫Ĥ餺
ꥹȤˤʣ̾ꡢ
.B patch
 \s-1POSIX\s0 ǤϤʤ
Υѥåե褦ȤƤ褦˸硢
.B patch
Ϻǥ쥯ȥ꤬Ǥ⾯ʤƺѤࡢŬ (best) ̾򤹤롣
.TP
.B " \(bu"
ʾε§ǥե̾ޤʤ硢
.B patch
ϥѥåƤե̾Ҥ̾͡Ȥ
.LP
Ǥʤե̾ΥꥹȤ
.I Ŭ (best)
Τ֤ˡ
.B patch
Ϥޤѥ̾ǤǤ⾯ʤΤӡ
椫١͡κǤûΤӡ
ˤ椫ǤûΤӡ
ǸˡĤäǺǽ̾֡
.PP
ˡΥߤ
.B Prereq:\&
ȤԤޤޤ硢
.B patch
Ϥɬ׾ιԤǽñ ( ̾ϥСֹ ) ꡢ
ꥸʥեˤñ줬뤫ɤå롣
⤷ʤ硢
.B patch
Ͻ˳ǧ롣
.PP
٤Ƥηϡ
˥塼꡼ȤäƤȤˤϡ
Τ褦ʴˤФ褤ȤȤǤ:
.Sp
	\fB| patch \-d /usr/src/local/blurfl\fP
.Sp
Сǥ쥯ȥ
.B blurfl
ˤեˡѥåޤ൭ľܥѥåƤ뤳ȤǤ롣
.PP
ѥåեʣΥѥåޤޤƤ硢
.B patch
ϡ줾줬̡Υѥåե뤫Ϥ줿Τ褦Ƥ褦Ȥ롣
ΤȤϡȤ櫓
ѥåƤե̾Ϥ줾κʬꥹȤޤʤФʤ餺
줾κʬꥹȤΥߤˤϥե̾ӥֹȤä
ɬפʤȤ餬ޤޤƤ뤳Ȥ롣
.SH "ץ"
.TP 3
\fB\-b\fP  ޤ  \fB\*=backup\fP
Хååץե롣
Ĥޤꡢե˥ѥåƤȤ
Υեˡ͡ޤϥԡ롣
¸ߤʤեХååפȤϡ
Ρɤ߽ФƤΤʤХååץե뤬졢
ե뤬¸ߤʤäȤɽΤȤʤ롣
Хååץե̾ɤΤ褦˷ޤ뤫ˤĤƤ
.B \-V
ޤ
.B \*=version\-control
ץ򻲾ȡ
.TP
.B \*=backup\-if\-mismatch
ѥåեˤԤäפʤäǡ
¾ˡǥХååפ׵ᤵƤʤ
եХååפ롣
.B patch
 \s-1POSIX\s0 ǤʤϥǥեȤǤ롣
.TP
.B \*=no\-backup\-if\-mismatch
ѥåեˤԤäפʤäǡ
¾ˡǥХååפ׵ᤵƤʤˤ
եХååפʤ
.B patch
 \s-1POSIX\s0 ξϥǥեȤǤ롣
.TP
\fB\-B\fP \fIpref\fP  ޤ  \fB\*=prefix=\fP\fIpref\fP
ʰץХååץե̾Ȥե̾
.I pref
ȤץեĤ롣
㤨С
.B "\-B\ /junk/"
Ȥȡ
.B src/patch/util.c
ȤեФʰץХååץե̾
.B /junk/src/patch/util.c
Ȥʤ롣
.TP
\fB\*=binary\fP
٤ƤΥեХʥ⡼ɤɤ߽񤭤롣
ɸϤ
.B /dev/tty

\s-1POSIX\s0 ΥƥǤϤΥץ̵Ǥ롣
Υץǰ㤤νФ \s-1DOS\s0 Τ褦ʥƥǤϡ
ѥå
.B "diff\ \-a\ \*=binary"
Τ褦ˤƺʤФʤʤ
.TP
\fB\-c\fP  ޤ  \fB\*=context\fP
ѥåե̾Υƥ diff ȤƲ᤹롣
.TP
\fB\-d\fP \fIdir\fP  ޤ  \fB\*=directory=\fP\fIdir\fP
򤹤ˡ
˥ǥ쥯ȥ
.I dir
˰ư롣
.TP
\fB\-D\fP \fIdefine\fP  ޤ  \fB\*=ifdef=\fP\fIdefine\fP
ѹ˰դΤ
.BR #ifdef " .\|.\|. " #endif
Τ褦ʹ¤Ȥ
ΤȤʬ򼨤ܥ
.I define
Ѥ롣
.TP
.B "\*=dry\-run"
ѥåƤȤη̤ɽ뤬
ºݤˤϤɤΥեѹʤ
.TP
\fB\-e\fP  ޤ  \fB\*=ed\fP
ѥåե
.B ed
ץȤȤƲ᤹롣
.TP
\fB\-E\fP  ޤ  \fB\*=remove\-empty\-files\fP
ѥåƤȶˤʤäե롣
̾ΥץפǤ롣
ʤʤ
.B patch
ϥإåΥॹפ򸫤ơѥåƤȤ
ե뤬¸ߤ٤ɤȽǤ뤳ȤǤ뤫Ǥ롣
Ϥƥ diff Ǥʤ
.B patch
 \s-1POSIX\s0 ξ硢
.B patch
ϤΥץͿʤ¤ѥå˶ˤʤäեʤ
.B patch
եȤϡ
ξ̥ǥ쥯ȥ褦Ȥ롣
.TP
\fB\-f\fP  ޤ  \fB\*=force\fP
桼򤷤褦ȤƤ뤫ʬäƤȤߤʤ
䤤碌򤷤ʤ
ɤΥե˥ѥåƤ٤
إå˽񤫤Ƥʤѥåϥåפ
եΥС󤬥ѥå
.B Prereq:\&
ιԤ˽񤫤줿СȰäƤƤѥåơ
ѥåȿžƤ褦˸ƤȿžƤʤȤߤʤ
ΥץϥȽϤʤ
.B \-s
Ȥȡ
.TP
\fB\-F\fP \fInum\fP  ޤ  \fB\*=fuzz=\fP\fInum\fP
fuzz factor κͤꤹ롣
Υץϥƥ diff ФƤΤͭǡ
.B patch
 hunk ŬѤ֤õȤ̵뤹Կκͤꤹ롣
fuzz factor 礭
ѥåְääƤޤ礬¿ʤ뤳Ȥդ뤳ȡ
ǥեȤ fuzz factor  2 ǡ
ƥ diff ΥƥȤιԿ礭ꤷƤϤʤʤ
ƥȤιԿ̾ 3 Ǥ롣
.TP
\fB\-g\fP \fInum\fP  ޤ  \fB\*=get=\fP\fInum\fP
Υץ
ե뤬 \s-1RCS\s0 ޤ \s-1SCCS\s0 ǴƤơ
ե뤬¸ߤʤɤ߼Ѥ
ǥեȥС˰פ硢
ޤϥե뤬 ClearCase ǴƤƥե뤬¸ߤʤ
.B patch
ưѹ롣
.I num
ǤС
.B patch
ϥӥƥफե ( å ) 롣
0 ǤС
.B patch
 \s-1RCS\s0, ClearCase, \s-1SCCS\s0 ̵뤷եʤ
ǤС
.B patch
ϥե뤫ɤ桼˿Ҥͤ롣
ΥץΥǥեȤͤϡ
Ķѿ
.B PATCH_GET
ꤵƤФͤȤʤ롣
Ǥʤ硢ǥեȤͤ
.B patch
 \s-1POSIX\s0 Ǥ 0 ǤʤȤʤ롣
.TP
.B "\*=help"
ץɽλ롣
.TP
\fB\-i\fP \fIpatchfile\fP  ޤ  \fB\*=input=\fP\fIpatchfile\fP
ѥå
.I patchfile
ɤ߹ࡣ
.I patchfile

.B \-
ξɸϤɤ߹ߡ줬ǥեȤǤ롣
.TP
\fB\-l\fP  ޤ  \fB\*=ignore\-whitespace\fP
֤䥹ڡѹƤΤˡѥΰפ뤯롣
ѥåե 1 Ĥޤʣζ¤Ӥ
ꥸʥեζΤɤ¤Ӥˤפ
ζ¤Ӥ̵뤵롣
̾ʸϴ˰פƤʤФʤʤ
ƥȤγƹԤϥꥸʥե 1 Ԥ˰פƤʤФʤʤ
.TP
\fB\-n\fP  ޤ  \fB\*=normal\fP
ѥåեΡޥ diff ȤƲ᤹롣
.TP
\fB\-N\fP  ޤ  \fB\*=forward\fP
ȿžƤȻפѥå䤹ǤŬѺѤߤȻפѥå̵뤹롣
.B \-R
⻲ȡ
.TP
\fB\-o\fP \fIoutfile\fP  ޤ  \fB\*=output=\fP\fIoutfile\fP
ե˥ѥåƤ֤ΤǤϤʤ
Ϥ
.I outfile
롣
.TP
\fB\-p\fP\fInum\fP  ޤ  \fB\*=strip\fP\fB=\fP\fInum\fP
ѥåեǸĤäե̾줾ˤĤơ
.I num
ĤΥåޤǾΥץե
ܤ 1 ĤޤʣΥå¤Ӥ 1 ĤΥåȤ
롣
Υץ
ѥåäͤȰۤʤǥ쥯ȥ˥եǼƤΤˡ
ѥåեΥե̾ΰѹ롣
㤨СѥåեΥե̾
.Sp
	\fB/u/howard/src/blurfl/blurfl.c\fP
.Sp
ǤäȤȡ
.B \-p0
Ȥȥե̾Τѹ줺Ѥ졢
.B \-p1
Ȥ
.Sp
	\fBu/howard/src/blurfl/blurfl.c\fP
.Sp
Τ褦ƬΥå夬졢
.B \-p4
Ȥ
.Sp
	\fBblurfl/blurfl.c\fP
.Sp
Τ褦ˤʤꡢ
.B \-p
ꤷʤ \fBblurfl.c\fP Ȥʤ롣
ǽŪ˻Ȥǥ쥯ȥ
ȥǥ쥯ȥꡢޤ
.B \-d
ץǻꤵ줿ǥ쥯ȥǤ롣
.TP
.B \*=posix
ʲΤ褦ˤ긷ʤ \s-1POSIX\s0 ɸˤ
.RS
.TP 3
.B " \(bu"
diff إåʣΥե̾줿硢
ꥹ (old, new, index) Τǽ¸ߤեѤ롣
.TP
.B " \(bu"
ѥåƤȶˤʤäեʤ
.TP
.B " \(bu"
\s-1RCS\s0, ClearCase, \s-1SCCS\s0 
ե뤫ɤҤͤʤ
.TP
.B " \(bu"
ޥɥ饤ǤϤ٤ƤΥץ󤬥եˤʤФʤʤ
.TP
.B " \(bu"
ѥåΥեˤԤäפʤǤ⡢
եХååפʤ
.RE
.TP
.BI \*=quoting\-style= word
ե̾ϤΤ˥
.I word
Ȥ
.I word
ϼΤɤ줫ǤʤФʤʤ:
.RS
.TP
.B literal
ե̾򤽤Τޤ޽Ϥ롣
.TP
.B shell
ե̾˥Υ᥿饯ޤޤ
ۣʽϤȤʤäƤޤ硢
ե̾˥Ѥΰդ롣
.TP
.B shell-always
̾ϰ䤬ɬפǤʤˤ⥷Ѥΰդ롣
.TP
.B c
C ʸƱͤ˥ե̾˰դ롣
.TP
.B escape
.B c
Ʊ褦˰դ뤬ǽȺǸΥ֥륯ʸά롣
.LP
.B \*=quoting\-style
ץΥǥեͤϴĶѿ
.B QUOTING_STYLE
ǻꤹ뤳ȤǤ롣
ĶѿꤵƤʤ硢ǥեͤ
.B shell
Ǥ롣
.RE
.TP
\fB\-r\fP \fIrejectfile\fP  ޤ  \fB\*=reject\-file=\fP\fIrejectfile\fP
reject ( Ѳ줿 hunk) 
ǥեȤ
.B \&.rej
եǤϤʤ
.I rejectfile
˽Ϥ롣
.TP
\fB\-R\fP  ޤ  \fB\*=reverse\fP
ΥѥåϿΥե뤬ȿžƤȤߤʤ
( ޤȤɤ롣ʹ֤Τ뤳Ȥ顣 )
.B patch
Ϥ줾 hunk Ƥȿž롣
reject ( Ѳ줿 hunk) ȿžȤηǽϤ롣
.B \-R
ץ
.B ed
 diff ץȤФƤưʤ
ȿФ򤹤ˤϾ󤬾ʤ뤫Ǥ롣
.Sp
ѥåκǽ hunk Ԥȡ
.B patch
 hunk ȿž뤫ɤߤ롣
⤷硢
.B \-R
ץ򥻥åȤ뤫ɤҤͤ롣
⤷ʤ硢̾ˡ³롣
( : ˡǤϡ
Ρޥ diff ǺǽΥޥɤɲä ( ĤޤꡢϺǤä ) 
ȿž줿ѥå򸡽Ф뤳ȤǤʤ
ϡΥƥȤϤɤˤǤޥå뤿ˡ
ɲäϾ뤫Ǥ롣
ۤȤɤΥѥåϹԤɲä뤫ѹΤǤäơ
ΤϾʤᡢ
иŪˤäơȿžΡޥ diff ΤۤȤɤϺϤޤäƤơ
ԤƤ롣 )
.TP
\fB\-s\fP  ޤ  \fB\*=silent\fP  ޤ  \fB\*=quiet\fP
顼ȯʤ¤ꡢŤư롣
.TP
\fB\-t\fP  ޤ  \fB\*=batch\fP
.B \-f
Ʊͤ˼롣
ۤʤ벾򤹤롣
إå˥ե̾ޤޤʤѥåϥåפ (\fB\-f\fP Ʊ ) 
եΥС󤬥ѥå
.B Prereq:\&
ιԤ˽񤫤줿СȰ㤦ѥåϥåפ
ѥåȿžƤ褦˸ȿžƤȤߤʤ
.TP
\fB\-T\fP  ޤ  \fB\*=set\-time\fP
ѥåƤȤΥեѹȥ
ƥ diff إåΥॹפꤹ롣
ƥ diff إåϥȤäƤȤߤʤ
ΥץϿ侩ʤ
ʤʤȤäѥåϰۤʤ륿ॾοͤˤ
ñ˻Ȥʤ顢
ޤ륿ॹפ
ޡĴǻ郎äۣˤʤ뤫Ǥ롣
ΥץȤˡ
\s-1UTC\s0 ǥѥå
.B \-Z
ޤ
.B \*=set\-utc
Ȥȡ
.TP
\fB\-u\fP  ޤ  \fB\*=unified\fP
ѥåե unified ƥ diff ȤƲ᤹롣
.TP
\fB\-v\fP  ޤ  \fB\*=version\fP
.B patch
Υӥإåȥѥå٥Ϥλ롣
.TP
\fB\-V\fP \fImethod\fP  ޤ  \fB\*=version\-control=\fP\fImethod\fP
Хååץե̾ꤹΤ
.I method
Ȥ
method 
.B PATCH_VERSION_CONTROL
( ޤϡ줬ʤ硢
.BR VERSION_CONTROL )
ĶѿǻǤΥץǾ񤭤롣
method ϥХååץե뤬뤫ɤˤϱƶ
Хååץե̾˱ƶǤ롣
.Sp
.I method
ͤ \s-1GNU\s0 Emacs  `version-control' ѿƱͤǤ롣
.B patch
Ϥäʬ䤹Ʊ򤹤롣
.I method
ͭͤϼΤȤǤ
( ̤դû̷ѤƤ褤 ):
.RS
.TP 3
\fBexisting\fP  ޤ  \fBnil\fP
ֹդΥХååפ硢Хååפֹդ롣
Ǥʤ硢ʰץХååפ롣
줬ǥեȤǤ롣
.TP
\fBnumbered\fP  ޤ  \fBt\fP
Хååפֹդ롣
.I F
ȤեФֹդХååץե̾
.IB F .~ N ~
Τ褦ˤʤ롣
.I N
ϥСֹǤ롣
.TP
\fBsimple\fP  ޤ  \fBnever\fP
ʰץХååפ롣
.B \-B
ޤ
.BR \*=prefix 
.B \-Y
ޤ
.BR \*=basename\-prefix 
.B \-z
ޤ
.B \*=suffix
ץǴʰץХååץե̾ޤ롣
ΤɤΥץꤵʤ硢
ʰץХååץեȤ롣
ե
.B SIMPLE_BACKUP_SUFFIX
Ķѿ¸ߤϤ͡Ǥʤ
.B \&.orig
Ǥ롣
.PP
ֹդޤϴʰץХååפξ硢
Хååץե̾Ĺȡ
˥Хååץե
.B ~
Ȥ롣
.B ~
ղäƤĹ硢
ե̾κǸʸ
.B ~
֤롣
.RE
.TP
\fB\*=verbose\fP
ԤʤͻҤˤĤɲäξϤ롣
.TP
\fB\-x\fP \fInum\fP  ޤ  \fB\*=debug=\fP\fInum\fP
ǥХåե饰ꤹ롣
.B patch
ѹͤˤ̣ΤʤΤǤ롣
.TP
\fB\-Y\fP \fIpref\fP  ޤ  \fB\*=basename\-prefix=\fP\fIpref\fP
ʰץХååץե̾Ȥ
ե̾Υ١͡
ץե
.I pref
դ롣
㤨С
.B "\-Y\ .del/"
Ȥ硢
.B src/patch/util.c
δʰץХååץե̾
.B src/patch/.del/util.c
Ȥʤ롣
.TP
\fB\-z\fP \fIsuffix\fP  ޤ  \fB\*=suffix=\fP\fIsuffix\fP
.I suffix
ʰץХååץեȤƻȤ
㤨С
.B "\-z\ -"
Ȥ硢
.B src/patch/util.c
δʰץХååץե̾
.B src/patch/util.c-
Ȥʤ롣
Хååץե
.B SIMPLE_BACKUP_SUFFIX
Ķѿǻꤹ뤳ȤǤΥץǾ񤭤롣
.TP
\fB\-Z\fP  ޤ  \fB\*=set\-utc\fP
ѥåƤȤΥեѹȥ
ƥ diff إåΥॹפꤹ롣
ƥ diff إå
 (\s-1UTC\s0 \s-1GMT\s0 ȤƤΤ ) 
ȤäƤȤߤʤ
.B \-T
ޤ
.B \*=set\-time
ץ⻲Ȥ뤳ȡ
.Sp
.B \-Z
ޤ
.B \*=set\-utc

.B \-T
ޤ
.B \*=set\-time
ץϡ̾ϥեΥꥸʥλ郎
ѥåإåλȰפʤ
ƤѥåȤԤäפʤˤϡեλꤷʤ

.B \-f
ޤ
.B \*=force
ץ󤬻ꤵ줿硢եλ϶Ūꤵ롣
.Sp
.B diff
νϷ¤Τᡢ
ΥץǤ
ƤѲʤեλϹʤ
ޤΥץȤäˤϡ
ѥåäե˰¸ե
( 㤨
.B "make\ clean"
 ) 
Ȥ
.B make
¹ԤȤ˥ѥåäեλ
𤷤ʤ褦ˤʤФʤʤ
.SH "Ķѿ"
.TP 3
.B PATCH_GET
.B patch
¸ߤʤեɤ߼ѤΥեǥեȤ
\s-1RCS\s0, ClearCase, \s-1SCCS\s0 뤫ɤꤹ롣
.B \-g
ޤ
.B \*=get
ץ򻲾ȡ
.TP
.B POSIXLY_CORRECT
ꤵƤ硢
.B patch
ϥǥեȤ
\s-1POSIX\s0 ɸˤ긷ʤ˽
.B \*=posix
ץ򻲾ȡ
.TP
.B QUOTING_STYLE
.B \*=quoting\-style
ץΥǥեȤ͡
.TP
.B SIMPLE_BACKUP_SUFFIX
.B \&.orig
˴ʰץХååץե̾˻Ȥĥҡ
.TP
\fBTMPDIR\fP, \fBTMP\fP, \fBTEMP\fP
եǥ쥯ȥ
.B patch
ϤΥꥹȤǺǽꤵƤĶѿȤ
ɤꤵƤʤ硢ǥեȤϥƥ¸Ǥ롣
Unix ۥȤǤ̾
.B /tmp
Ǥ롣
.TP
\fBVERSION_CONTROL\fP ޤ \fBPATCH_VERSION_CONTROL\fP
С󥳥ȥ륹򤹤롣
.B \-V
ޤ
.B \*=version\-control
ץ򻲾ȡ
.SH "ե"
.TP 3
.IB $TMPDIR "/p\(**"
ե롣
.TP
.B /dev/tty
ü桼˿Ҥͤ뤿˻Ȥ롣
.SH "Ϣ"
.BR diff (1),
.BR ed (1)
.Sp
Marshall T. Rose and Einar A. Stefferud,
Proposed Standard for Message Encapsulation,
Internet RFC 934 <URL:ftp://ftp.isi.edu/in-notes/rfc934.txt> (1985-01).
.SH "ѥåͤؤ"
ѥåȤ˿αƤʤФʤʤĤ롣
.PP
ѥå򵡳Ū˺뤳ȡ
褤ˡ
.BI "diff\ \-Naur\ " "old\ new"
Τ褦ʥޥɤȤȤǤ롣
.I new

.I old
Ϥ줾쿷Υǥ쥯ȥǤ롣
.I old

.I new
ˤ 1 Ĥ⥹å夬äƤϤʤ
.B diff
ޥɤΥإå˴ޤޤŪ Unix Ȥä
ǽ񤫤ƤʤФʤʤ

ѥåäͤ
.B \-Z
ޤ
.B \*=set\-utc
ץȤȤǤ롣
ΤΤ Bourne ȤäޥǤ:
.Sp
	\fBLC_ALL=C TZ=UTC0 diff \-Naur gcc\-2.7 gcc\-2.8\fP
.PP
ͤˤϥѥå롣
ĤޤꡢɤΥǥ쥯ȥ
.B cd
Ф褤Ȥɤ
.B patch
ץȤФ褤롣
ץʸ
.B "\-Np1"
侩롣
äͤˤʤäĤǼ
ꥸʥեΥԡäơäѥåƤƤߤ롣
.PP
Фѥåեκǽ diff Ȥơ
ѥå٥򥤥󥯥ȤƤ
.B patchlevel.h
եƤȡ
¿οͤݤڸǤ롣
ѥå
.B Prereq:\&
ԤäƤС
ְ֤㤨Ʒٹ򿩤餦ΤɤȤǤ롣
.PP
.B /dev/null

 Epoch (1970-01-01 00:00:00 \s-1UTC\s0) ζΥե
եӤ diff 뤳Ȥǡ
ե뤳ȤǤ롣
ˡϥåȤΥǥ쥯ȥ˺ե뤬
ޤ¸ߤʤ˸¤äư롣
ȿФˡե Epoch ζΥեӤ
ƥ diff 뤳Ȥǡե뤳ȤǤ롣
ե
.B patch
 \s-1POSIX\s0 Ǥʤ
.B \-E
ޤ
.B \*=remove\-empty\-files
ץ󤬻ꤵʤ˺롣
եꤹѥåñˡϡ
\s-1GNU\s0
.B diff

.B \-N
ޤ
.B \*=new\-file
ץȤȤǤ롣
.PP
äͤ
.BI \-p N
ץȤȤꤵ硢
Τ褦ʥѥåʤ:
.Sp
.ft B
.ne 3
	diff \-Naur v2.0.29/prog/README prog/README
.br
	\-\^\-\^\- v2.0.29/prog/README   Mon Mar 10 15:13:12 1997
.br
	+\^+\^+ prog/README   Mon Mar 17 14:58:22 1997
.ft
.Sp
ʤʤĤΥե̾ϰۤʤΥåޤǤꡢ
.B patch
ΥСˤä
ե̾ۤʤ褦˲᤹뤫Ǥ롣
򤱤뤿ˡ˼Τ褦ʥѥå뤳:
.Sp
.ft B
.ne 3
	diff \-Naur v2.0.29/prog/README v2.0.30/prog/README
.br
	\-\^\-\^\- v2.0.29/prog/README   Mon Mar 10 15:13:12 1997
.br
	+\^+\^+ v2.0.30/prog/README   Mon Mar 17 14:58:22 1997
.ft
.Sp
.PP
Хååץե̾Ʊե롢㤨
.B README.orig
Ӥѥåʤȡ
ˡǤ
.B patch
𤷤ơ
եǤϤʤ
Хååץե˥ѥåƤƤޤ⤷ʤǤ롣
ǤϤʤ
ե̾Ʊ̤Υǥ쥯ȥˤեɤ㤨
.B old/README

.B new/README
Ӥѥå뤳ȡ
.PP
ȿžѥåʤ褦դ뤳ȡ
⤦ѥåƤΤȻפäƤޤǤ롣
.PP
ưե
( 㤨С makefile 
.B "configure: configure.in"
ȤԤ
.B configure
Ȥե )
ѹѥåʤ褦ˤ뤳ȡ
äͤϼưե뤳ȤǤ뤫Ǥ롣
ưե diff ʤФʤʤ硢
\s-1UTC\s0 Ѥ diff ꡢ
äͤ
.B \-Z
ޤ
.B \*=set\-utc
ץȤäƥѥåƤƤ餤
ѥåäե˰¸롢
ѥåäƤʤեƤ餦
( 㤨
.B "make\ clean"
 ) 
.PP
582 κʬꥹȤ 1 ĤΥեʤƤѤΤǤС
㤰ˤʤäƤޤä
Ϣѥå̡ΥեˤޤȤƤΤǤ롣
.SH "顼Ƚλơ"
顼ϰ̤ˡ
.B patch
ѥåեϤǤʤäȤ򼨤Ƥ롣
.PP
.B \*=verbose
ץꤷ硢
.B Hmm.\|.\|.\&
ϥѥåե˽ʤäƥȤꡢ
.B patch
ƥȤ˥ѥå뤫ɤ
ɬõȤƤ뤳ȤɽƤ롣
ѥåĤȡΥѥåɤʼΤΤ򼨤
.PP
.B patch
νλơϡ
٤Ƥ hunk ŬѤ 0 
 hunk ŬѤǤʤä 1 
äȿ˸줿 2 Ȥʤ롣
ХåʣΥѥåŬѤ硢
λơåơ
ʬŪˤѥåäƤʤե
ʹߤΥѥåƤʤ褦ˤ뤳ȤɬפǤ롣
.SH "ٹ"
ƥ diff ϶ΥեΥǥ쥯ȥꡢ
ܥå󥯤ʤɤΥڥեκ
μ¤ɽȤϤǤʤ
ͭԤ䥢¡ե뤬
̤ΥեΥϡɥ󥯤Ǥ뤳ȤȤä
ե᥿ǡѹɽȤǤʤ
⤷Τ褦ѹɬפǤС
̤˼ ( 㤨С륹ץ ) Ѱդơ
ѥåźդʤФʤʤ
.PP
.B patch
ϡ
.B ed
ץιֹ椬Ϥ߽ФƤ뤫ɤʬʤ
Ρޥ diff ιֹδְ㤤
ѹ򸫤Ĥ˸¤äƸФǤ롣
fuzz factor  3 Υƥ diff Ʊ뤫⤷ʤ
ŬüΥ󥿥եƳޤǤϡ
Τ褦ʾϥƥ diff ä
ѹɤǧʤФʤʤ
󡢥顼ʤѥǤȤ
ѥåޤä褤ڵˤʤ뤬ɬ⤽ȤϤʤ
.PP
.B patch
¿ο¬ɬפʾǤäƤ⡢̤̾Ф
̤ȤݾڤΤϡ
Υѥå줿եƱΥС
եŬѤ줿Ǥ롣
.SH "ߴ"
\s-1POSIX\s0 ɸ
.B patch
θŵŪʿ񤤤Ȱۤʤ뿶񤤤ꤷƤ롣
.B patch
ΥС 2.1 Ӥ (  \s-1POSIX\s0 
򤷤Ƥʤ ) 
ߤ˱ѤʤФʤʤ硢ΰ㤤ΤäƤɬפ롣
.TP 3
.B " \(bu"
ŵŪ
.B patch
Ǥϡ
.B \-p
ץΰϾάǽǤꡢñȤ
.B \-p

.B \-p0
ƱǤä

.B patch
Ǥ
.B \-p
ץ˰ɬܤǡ
.B "\-p\ 0"

.B \-p0
ƱǤ롣
ߴ¤ݤĤˡ
.B \-p0

.B \-p1
ȤäץȤ
.Sp
ޤŵŪ
.B patch
ϥѥץեݡåοñ˿Ƥ

.B patch
ϥѥ̾Ǥ롣
Ĥޤꡢ 1 Ĥޤʣܤ륹å
1 ĤΥåȤƿ롣
ߴ¤ݤĤˡ
ե̾
.B //
ޤѥåʤ褦ˤ뤳ȡ
.TP
.B " \(bu"
ŵŪ
.B patch
ǤϡǥեȤǥХååפͭǤä

.B patch
Ǥ
.B \-b
ޤ
.B \*=backup
ץͭˤʤ롣
.Sp
ȿФˡ \s-1POSIX\s0
.B patch
Ǥϡ礬äƤХååפϰںʤ
\s-1GNU\s0
.B patch
Ǥϡο񤤤
.B \*=no\-backup\-if\-mismatch
ץ󤫡
.B \*=posix
ץޤ
.B POSIXLY_CORRECT
Ķѿ \s-1POSIX\s0 ˤ뤫ͭˤʤ롣
.Sp
ŵŪ
.B patch

.BI \-b "\ suffix"
ץ
\s-1GNU\s0
.B patch

.BI "\-b\ \-z" "\ suffix"
ץƱǤ롣
.TP
.B " \(bu"
ŵŪ
.B patch
ϡ
ѥåإåѥåƤե̾ꤹΤ
ʣ ( ⴰˤϥɥȤˤʤäƤʤ ) ˡѤƤ
μˡ \s-1POSIX\s0 ˽򤷤Ƥ餺Ĥ⤢ä

.B patch
ϰۤʤ롢Ʊ餤ʣ (ɥȤϤޤ) ˡѤƤꡢ
ץ \s-1POSIX\s0 ˽򤹤뤳ȤǤ롣
꤬äƤȤ褤Τ
2 Ĥμˡϡ
ƥ diff ΥإåΥե̾
.B Index:\&
ιԤץեƱǤˤϸߴ롣
äѥåϡ
줾ΥإåΥե̾٤ƱΥåޤǤС
̾ϸߴ롣
.TP
.B " \(bu"
ŵŪ
.B patch
桼˼򤹤Ȥϡ
ɸ२顼˽Ϥ
ʲΥꥹȤΤߥʥǤǽΥե뤫:
ɸ२顼ɸϡ
.BR /dev/tty 
ɸϡ

.B patch
ϼɸϤ˽Ϥ
.B /dev/tty
롣
ΥǥեȤΤĤѹƤꡢ
ǥեȤβȤäƤ
.B patch
̵¥롼פ˴٤ʤ褦ˤʤäƤ롣
.TP
.B " \(bu"
ŵŪ
.B patch
ϡԤ hunk ο򥹥ơͤȤƽλ
˽Ф路 1 򥹥ơͤȤƤ

.B patch
 hunk Ԥ 1 ǽλ꤬ 2 ǽλ롣
.TP
.B " \(bu"
\s-1GNU\s0
.BR patch 
ŵŪ
.BR patch 
\s-1POSIX\s0 
.B patch
ΤɤȤʬʤͤ˰ƤƼ硢
ΥץʳϻȤʤȡ
ʲΥꥹȤǤ϶̣ɬܤǤ롣
.Sp
.nf
.in +3
.ne 11
.B \-c
.BI \-d " dir"
.BI \-D " define"
.B \-e
.B \-l
.B \-n
.B \-N
.BI \-o " outfile"
.BI \-p num
.B \-R
.BI \-r " rejectfile"
.in
.fi
.SH "Х"
ХŻҥ᡼
.B <bug-gnu-utils@gnu.org>
𤷤Ƥ
.PP
.B patch
ʬפ礭æեåȤҤä֤äɤФ
äȸ뤳ȤǤƻĹ
.PP
ɤʣƤ ( 㤨
\fB#ifdef OLDCODE\fP .\|.\|. \fB#else .\|.\|. #endif\fP
Τ褦˶ڤƤ ) 
.B patch
ξΥС˥ѥåƤ뤳ȤϤǤʤ
⤷ѥåäȤ顢
ְäۤ˥ѥåäƤޤäƤ뤳Ȥ褯ꡢ
Ǥ³Ȥ
.PP
ǤäƤѥåƤ褦Ȥȡ
.B patch
ϥѥåȿžƤȻפѥå᤹Ҥͤ롣
ϵǽΤҤȤĤȤߤʤȤǤ褦
.SH ""
Copyright
.if t \(co
1984, 1985, 1986, 1988 Larry Wall.
.br
Copyright
.if t \(co
1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998
Free Software Foundation, Inc.
.PP
Permission is granted to make and distribute verbatim copies of
this manual provided the copyright notice and this permission notice
are preserved on all copies.
.PP
Permission is granted to copy and distribute modified versions of this
manual under the conditions for verbatim copying, provided that the
entire resulting derived work is distributed under the terms of a
permission notice identical to this one.
.PP
Permission is granted to copy and distribute translations of this
manual into another language, under the above conditions for modified
versions, except that this permission notice may be included in
translations approved by the copyright holders instead of in
the original English.
.SH ""
ꥸʥ
.B patch
 Larry Wall 񤤤
Paul Eggert Ū¤
Хʥեؤб䡢եλꡢեκɲä
ޤ \s-1POSIX\s0 ˽򤹤褦ˤ
ۤˤ Wayne Davison  unidiff ؤбɲä
David MacKenzie ե졼ȥХååפؤбɲä