Up: Invoking diff   [Contents][Index]


13.1 diff¤Ø¤Î¥ª¥×¥·¥ç¥ó

°Ê²¼¤Ï¡¤GNU diff¤¬¼õ¤±Æþ¤ì¤ë¤¹¤Ù¤Æ¤Î¥ª¥×¥·¥ç¥ó¤Î³µÍפǤ¹¡¥ ¤Û¤È¤ó¤É¤Î¥ª¥×¥·¥ç¥ó¤ÏÆó¤Ä¤ÎÅù²Á¤Ê̾Á°¤¬¤¢¤ê¡¤°ì¤Ä¤Ï‘-’¤¬Á°ÃÖ¤µ¤ì¤¿ ñ°ìʸ»ú¤Ç¡¤¤â¤¦°ì¤Ä¤Ï‘--’¤¬Á°ÃÖ¤µ¤ì¤Æ¤¤¤ëŤ¤Ì¾Á°¤Ç¤¹¡¥Ê£¿ô¤Î(°ú¿ô ¤ò¼è¤é¤Ê¤¤) ñ°ìʸ»ú¤Î¥ª¥×¥·¥ç¥ó¤ò¡¤Ã±°ì¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¤Îñ¸ì¤ËÁȤ߹ç¤ï ¤»¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡¥-ac¤Ï-a -c¤ÈÅù²Á¤Ç¤¹¡¥Ä¹¤¤Ì¾Á°¤Î¥ª ¥×¥·¥ç¥ó¤Ï¡¤¤½¤Î̾Á°¤Î¥æ¥Ë¡¼¥¯¤ÊÁ°ÊýÉôʬ¤Ç¾Êά¤¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡¥¥«¥Ã¥³ ([¤È])¤Ï¡¤¥ª¥×¥·¥ç¥ó¤Ç°ú¿ô¤ò¼è¤ë¥ª¥×¥·¥ç¥ó¤ò¼¨¤·¤Þ¤¹¡¥

-a
--text

¥Õ¥¡¥¤¥ë¤¬¥Æ¥­¥¹¥È¤Î¤è¤¦¤Ë¤Ï¸«¤¨¤Ê¤¤¾ì¹ç¤Ç¤â¡¤¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤ò¥Æ¥­¥¹¥È ¤È¤·¤Æ°·¤¤¡¤¹Ôñ°Ì¤ÇÈæ³Ó¤·¤Þ¤¹¡¥See Binary.

-b
--ignore-space-change

¶õÇò¤ÎÎ̤ˤè¤ëÊѹ¹¤ò̵»ë¤·¤Þ¤¹¡¥See White Space.

-B
--ignore-blank-lines

¶õÇò¹Ô¤ÎÁÞÆþ¤äºï½ü¤Î¤ß¤ÎÊѹ¹¤ò̵»ë¤·¤Þ¤¹¡¥See Blank Lines.

--binary

¥Ð¥¤¥Ê¥ê¥â¡¼¥É¤Ç¥Ç¡¼¥¿¤òÆÉ¤ß½ñ¤­¤·¤Þ¤¹¡¥See Binary.

-c

¼þ¤ê¤Î»°¹Ô¤òɽ¼¨¤·¤Ê¤¬¤é¡¤¼þ¤ê¤Îʸ¤ò»ÈÍѤ·¤¿½ÐÎϽñ¼°¤ò»ÈÍѤ·¤Þ¤¹¡¥ See Context Format.

-C lines
--context[=lines]

¼þ¤ê¤Îlines¹Ô(À°¿ô)¡¤¤Þ¤¿¤Ïlines¤¬Í¿¤¨¤é¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï»°¹Ô ¤òɽ¼¨¤·¤Ê¤¬¤é¼þ¤ê¤Îʸ¤ò»ÈÍѤ·¤¿½ÐÎϽñ¼°¤ò»ÈÍѤ·¤Þ¤¹¡¥See Context Format. ŬÀڤ˽èÍý¤¹¤ë¤¿¤á¡¤Ä̾ïpatch¤Ï¾¯¤Ê¤¯¤È¤âÆó¹ÔɬÍ×¤Ç ¤¹¡¥

¸Å¤¤¥·¥¹¥Æ¥à¤Ç¤Ï¡¤diff¤Ï¡¤»þÂåÃÙ¤ì¤Î-c¤ä-p¤È ÁȤ߹ç¤ï¤»¤¿¤È¤­¸ú²Ì¤¬¤¢¤ë-lines¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤¹¡¥ POSIX 1003.1-2001 (see Standards conformance)¤Ç¤Ï¡¤¤³¤ì¤òµö²Ä¤· ¤Æ¤¤¤Þ¤»¤ó¡¥Âå¤ï¤ê¤Ë-C lines¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡¥

--changed-group-format=format

if-then-else½ñ¼°¤Ç¡¤Î¾Êý¤Î¥Õ¥¡¥¤¥ë¤Î°Û¤Ê¤Ã¤Æ¤¤¤ëÉôʬ¤Î¹Ô¥°¥ë¡¼¥×¤ò½ÐÎϤ¹ ¤ë¤¿¤áformat¤ò»ÈÍѤ·¤Þ¤¹¡¥See Line Group Formats.

-d
--minimal

Êѹ¹¤ÎÁȤ¬¤è¤ê¾®¤µ¤¯¤Ê¤ë¤è¤¦¤Ëõ¤¹¥¢¥ë¥´¥ê¥º¥à¤ËÊѹ¹¤·¤Þ¤¹¡¥¤³¤ì¤Ç diff¤Ï¤è¤êÃÙ¤¯(»þ¤Ë¤ÏÈó¾ï¤ËÃÙ¤¯)¤Ê¤ê¤Þ¤¹¡¥See diff Performance.

-D name
--ifdef=name

¥Þ¥¯¥í̾¤Î¥Ý¥ê¥×¥í¥»¥Ã¥µ¤Î¾ò·ï¼°¤È¤Ê¤ë¡¤¥Þ¡¼¥¸¤µ¤ì¤¿‘#ifdef’½ñ¼°¤Î ½ÐÎϤòÀ¸À®¤·¤Þ¤¹¡¥See If-then-else.

-e
--ed

Í­¸ú¤Êed¥¹¥¯¥ê¥×¥È¤È¤Ê¤ë½ÐÎϤòÀ¸À®¤·¤Þ¤¹¡¥See ed Scripts.

-E
--ignore-tab-expansion

¥¿¥Ö¤ÎŸ³«¤Ë¤è¤ëÊѹ¹¤ò̵»ë¤·¤Þ¤¹¡¥See White Space.

-f
--forward-ed

ed¥¹¥¯¥ê¥×¥È¤Î¤è¤¦¤Ë¸«¤¨¤ë½ÐÎϤòÀ¸À®¤·¤Þ¤¹¤¬¡¤¥Õ¥¡¥¤¥ë¤Ç¤Î½ç½ø ¤ÏÊѹ¹¤µ¤ì¤Æ¤¤¤Þ¤¹¡¥See Forward ed.

-F regexp
--show-function-line=regexp

¼þ¤ê¤Îʸ¤ò»ÈÍѤ·¤¿¤ê°ìÂ⽤·¤¿½ñ¼°¤Ç¡¤¤½¤ì¤¾¤ì¤Îº¹°Û¤Îhunk¤ËÂФ·¡¤ regexp¤Ë¥Þ¥Ã¥Á¤·¤¿¤½¤ì°ÊÁ°¤Ë¤¢¤ëºÇ¸å¤Î¹Ô¤òɽ¼¨¤·¤Þ¤¹¡¥

--from-file=file

file¤ò¤½¤ì¤¾¤ì¤Î¥ª¥Ú¥é¥ó¥É¤ÈÈæ³Ó¤·¤Þ¤¹¡¥file¤Ï¥Ç¥£¥ì¥¯¥È¥ê¤Ç ¤â¤«¤Þ¤¤¤Þ¤»¤ó¡¥

--help

»ÈÍÑÊýË¡¤Î³µÍפò½ÐÎϤ·½ªÎ»¤·¤Þ¤¹¡¥

--horizon-lines=lines

¶¦Ä̤κǽé¤ÎÉôʬ¤ÎºÇ¸å¤Îlines¹Ô¤È¶¦Ä̤νª¤ê¤ÎÉôʬ¤ÎºÇ½é¤Î lines¹Ô¤òºï½ü¤·¤Þ¤»¤ó¡¥See diff Performance.

-i
--ignore-case

Âçʸ»ú¾®Ê¸»ú¤ÎÊѹ¹¤ò̵»ë¤·¤Þ¤¹¡¥Âçʸ»ú¤È¾®Ê¸»ú¤ÏÅù²Á¤À¤È¹Í¤¨¤Þ¤¹¡¥ See Case Folding.

-I regexp
--ignore-matching-lines=regexp

regexp¤Ë¥Þ¥Ã¥Á¤¹¤ë¹Ô¤ÎÁÞÆþ¤Èºï½ü¤À¤±¤ÎÊѹ¹¤ò̵»ë¤·¤Þ¤¹¡¥ See Specified Folding.

--ignore-file-name-case

ºÆµ¢Åª¤ÊÈæ³Ó¤Ç¥Õ¥¡¥¤¥ë̾¤òÈæ³Ó¤·¤Æ¤¤¤ë»þ¡¤Âçʸ»ú¾®Ê¸»ú¤ò̵»ë¤·¤Þ¤¹¡¥ See Comparing Directories.

-l
--paginate

¥Ú¡¼¥¸ÉÕ¤±¤¹¤ë¤¿¤á¤Ë½ÐÎϤòpr¤ËÅϤ·¤Þ¤¹¡¥See Pagination.

-L label
--label=label

¼þ¤ê¤Îʸ¤ò»ÈÍѤ·¤¿½ñ¼°(see Context Format)¤È°ìÂ⽤·¤¿½ñ¼° (see Unified Format)¤Î¥Ø¥Ã¥À¤Ç¡¤¥Õ¥¡¥¤¥ë̾¤ÎÂå¤ï¤ê¤Ë¥é¥Ù¥ë¤ò»ÈÍѤ·¤Þ ¤¹¡¥See RCS.

--left-column

²£¤Ëʤ٤¿½ñ¼°¤Ç¡¤Æó¤Ä¤Ë¶¦Ä̤ʹԤòº¸¤ÎÎó¤À¤±¤Ë½ÐÎϤ·¤Þ¤¹¡¥See Side by Side Format.

--line-format=format

if-then-else½ñ¼°¤Ç¡¤¤¹¤Ù¤Æ¤ÎÆþÎϹԤò½ÐÎϤ¹¤ë¤¿¤áformat¤ò»ÈÍѤ·¤Þ¤¹¡¥ See Line Formats.

-n
--rcs

RCS½ñ¼°¤Îº¹Ê¬¤ò½ÐÎϤ·¤Þ¤¹¡¥-f¤Ë»÷¤Æ¤¤¤Þ¤¹¤¬¤½¤ì¤¾¤ì¤Î¥³¥Þ ¥ó¥É¤ÏºîÍѤ¹¤ë¹ÔÈÖ¹æ¤ò»ØÄꤷ¤Þ¤¹¡¥See RCS.

-N
--new-file

¥Ç¥£¥ì¥¯¥È¥ê¤ÎÈæ³Ó¤Ç¡¤¥Õ¥¡¥¤¥ë¤¬°ìÊý¤Î¥Ç¥£¥ì¥¯¥È¥ê¤À¤±¤Ç¸«¤Ä¤«¤Ã¤¿¾ì¹ç¡¤ ¤â¤¦°ìÊý¤Ë¤Ï¶õ¤Î¤â¤Î¤¬Â¸ºß¤·¤Æ¤¤¤ë¤«¤Î¤è¤¦¤Ë½èÍý¤·¤Þ¤¹¡¥See Comparing Directories.

--new-group-format=format

if-then-else½ñ¼°¤Ç¡¤ÆóÈÖÌܤΥե¡¥¤¥ë¤«¤é¤Î¹Ô¤Î¥°¥ë¡¼¥×¤ò½ÐÎϤ¹¤ë¤¿¤á¤Ë¡¤ format¤ò»ÈÍѤ·¤Þ¤¹¡¥See Line Group Formats.

--new-line-format=format

if-then-else½ñ¼°¤Ç¡¤ÆóÈÖÌܤΥե¡¥¤¥ë¤«¤é¤Î¹Ô¤ò½ÐÎϤ¹¤ë¤¿¤á¤Ë¡¤ format¤ò»ÈÍѤ·¤Þ¤¹¡¥See Line Formats.

--old-group-format=format

if-then-else½ñ¼°¤Ç¡¤ºÇ½é¤Î¥Õ¥¡¥¤¥ë¤«¤é¤Î¹Ô¤Î¥°¥ë¡¼¥×¤ò½ÐÎϤ¹¤ë¤¿¤á¤Ë¡¤ format¤ò»ÈÍѤ·¤Þ¤¹¡¥See Line Group Formats.

--old-line-format=format

if-then-else½ñ¼°¤Ç¡¤ºÇ½é¤Î¥Õ¥¡¥¤¥ë¤«¤é¤Î¹Ô¤ò½ÐÎϤ¹¤ë¤¿¤á¤Ë¡¤format ¤ò»ÈÍѤ·¤Þ¤¹¡¥See Line Formats.

-p
--show-c-function

Êѹ¹¤¬¤¢¤Ã¤¿¤½¤ì¤¾¤ì¤ÎC´Ø¿ô¤òɽ¼¨¤·¤Þ¤¹¡¥See C Function Headings.

-q
--brief

¥Õ¥¡¥¤¥ë¤Ëº¹°Û¤¬¤¢¤ë¤«¤É¤¦¤«¤òÊó¹ð¤¹¤ë¤À¤±¤Ç¡¤º¹°Û¤ò¾Ü½Ò¤·¤Þ¤»¤ó¡¥ See Brief.

-r
--recursive

¥Ç¥£¥ì¥¯¥È¥ê¤ÎÈæ³Ó»þ¤Ë¡¤¸«¤Ä¤«¤Ã¤¿¤¹¤Ù¤Æ¤Î¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤òºÆµ¢Åª¤ËÈæ³Ó ¤·¤Þ¤¹¡¥See Comparing Directories.

-s
--report-identical-files

Æó¤Ä¤Î¥Õ¥¡¥¤¥ë¤¬Æ±¤¸¤È¤­Êó¹ð¤·¤Þ¤¹¡¥See Comparing Directories.

-S file
--starting-file=file

¥Ç¥£¥ì¥¯¥È¥ê¤ÎÈæ³Ó»þ¤Ë¡¤¥Õ¥¡¥¤¥ëfile¤«¤é³«»Ï¤·¤Þ¤¹¡¥¤³¤ì¤Ï¡¤Ãæ»ß¤µ ¤ì¤¿Èæ³Ó¤òºÆ³«¤¹¤ë¤¿¤á¤Ë»ÈÍѤ·¤Þ¤¹¡¥See Comparing Directories.

-H
--speed-large-files

¾®¤µ¤ÊÊѹ¹¤¬ÂçÎ̤ˤ¢¤ëÂ礭¤Ê¥Õ¥¡¥¤¥ë¤Î½èÍý¤ò¹â®²½¤¹¤ë¤¿¤á¡¤È¯¸«Åª¼êË¡¤ò »ÈÍѤ·¤Þ¤¹¡¥See diff Performance.

--strip-trailing-cr

ÆþÎϹԤκǸå¤Ë¸åÃÖ¤µ¤ì¤ë²þ¹Ô¤òºï½ü¤·¤Þ¤¹¡¥See Binary.

--suppress-common-lines

²£¤Ëʤ٤¿½ñ¼°¤Ç¡¤¶¦Ä̤ιԤò½ÐÎϤ·¤Þ¤»¤ó¡¥See Side by Side Format.

-t
--expand-tabs

ÆþÎÏ¥Õ¥¡¥¤¥ë¤Î¥¿¥Ö¤Ë¤è¤ë°ÌÃÖ¹ç¤ï¤»ÊÝ»ý¤¹¤ë¤¿¤á¡¤½ÐÎϤΥ¿¥Ö¤ò¥¹¥Ú¡¼¥¹¤ËŸ ³«¤·¤Þ¤¹¡¥See Tabs.

-T
--initial-tab

Ä̾ï¤Þ¤¿¤Ï¼þ¤ê¤Îʸ¤ò»ÈÍѤ¹¤ë½ñ¼°¤Ç¡¤¹Ô¤Î¥Æ¥­¥¹¥È¤ÎÁ°¤Ë¥¹¥Ú¡¼¥¹¤Ç¤Ï¤Ê¤¯¥¿ ¥Ö¤ò½ÐÎϤ·¤Þ¤¹¡¥¤³¤ì¤Ç¹Ô¤Î¥¿¥Ö¤Ç¤Î°ÌÃÖ¹ç¤ï¤»¤¬Ä̾ïÄ̤ê¤Ë¸«¤¨¤Þ¤¹¡¥ See Tabs.

--to-file=file

¤½¤ì¤¾¤ì¤Î¥ª¥Ú¥é¥ó¥É¤òfile¤ÈÈæ³Ó¤·¤Þ¤¹¡¥file¤Ï¥Ç¥£¥ì¥¯¥È¥ê¤Ç ¤â¤«¤Þ¤¤¤Þ¤»¤ó¡¥

-u

°ìÂ⽤·¤¿½ÐÎϽñ¼°¤ò»ÈÍѤ·¡¤¼þ¤ê¤Îʸ¤ò»°¹Ôɽ¼¨¤·¤Þ¤¹¡¥See Unified Format.

--unchanged-group-format=format

if-then-else½ñ¼°¤Ç¡¤Î¾Êý¤Î¥Õ¥¡¥¤¥ë¤«¤é¤Î¶¦Ä̤ιԤΥ°¥ë¡¼¥×¤ò½ÐÎϤ¹¤ë¤¿¤á ¤Ë¡¤format¤ò»ÈÍѤ·¤Þ¤¹¡¥See Line Group Formats.

--unchanged-line-format=format

if-then-else½ñ¼°¤Ç¡¤Î¾Êý¤Î¥Õ¥¡¥¤¥ë¤Ë¶¦Ä̤ʹԤò½ÐÎϤ¹¤ë¤¿¤á¤Ë¡¤ format ¤ò»ÈÍѤ·¤Þ¤¹¡¥See Line Formats.

-P
--unidirectional-new-file

¥Ç¥£¥ì¥¯¥È¥ê¤ÎÈæ³Ó»þ¤Ë¡¤Æó¤Ä¤Î¤¦¤ÁÆóÈÖÌܤΥǥ£¥ì¥¯¥È¥ê¤À¤±¤Ë¥Õ¥¡¥¤¥ë¤¬¤¢ ¤ë¾ì¹ç¡¤¤â¤¦°ìÊý¤Ë¤Ï¶õ¤Î¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤·¤Æ¤¤¤ë¤«¤Î¤è¤¦¤Ë°·¤¤¤Þ¤¹¡¥ See Comparing Directories.

-U lines
--unified[=lines]

¼þ¤ê¤Îlines¹Ô(À°¿ô)¡¤¤Þ¤¿¤Ïlines¤¬Í¿¤¨¤é¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï»°¹Ô ¤òɽ¼¨¤·¤Ê¤¬¤é°ìÂ⽤·¤¿½ÐÎϽñ¼°¤ò»ÈÍѤ·¤Þ¤¹¡¥See Unified Format. Ŭ Àڤ˽èÍý¤¹¤ë¤¿¤á¡¤Ä̾ïpatch¤Ï¾¯¤Ê¤¯¤È¤âÆó¹ÔɬÍפǤ¹¡¥

¸Å¤¤¥·¥¹¥Æ¥à¤Ç¤Ï¡¤diff¤Ï¡¤»þÂåÃÙ¤ì¤Î-u¤ÈÁȤ߹ç¤ï¤»¤¿ ¤È¤­¸ú²Ì¤¬¤¢¤ë-lines¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤¹¡¥POSIX 1003.1-2001 (see Standards conformance)¤Ç¤Ï¡¤¤³¤ì¤òµö²Ä¤·¤Æ¤¤¤Þ¤»¤ó¡¥ Âå¤ï¤ê¤Ë-U lines¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡¥

-v
--version

¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤ò½ÐÎϤ·½ªÎ»¤·¤Þ¤¹¡¥

-w
--ignore-all-space

¹Ô¤ÎÈæ³Ó»þ¤Ë¶õÇò¤ò̵»ë¤·¤Þ¤¹¡¥See White Space.

-W columns
--width=columns

²£¤Ëʤ٤¿½ñ¼°¤Ç¡¤¹Ô¤´¤È¤ËºÇÂçcolumns¹Ô(¥Ç¥Õ¥©¥ë¥È¤Ï130)½ÐÎϤ·¤Þ¤¹¡¥ See Side by Side Format.

-x pattern
--exclude=pattern

¥Ç¥£¥ì¥¯¥È¥ê¤ÎÈæ³Ó»þ¤Ë¡¤¥Ù¡¼¥¹Ì¾¤¬pattern¤Ë¥Þ¥Ã¥Á¤¹¤ë¥Õ¥¡¥¤¥ë¤È¥µ ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤ò̵»ë¤·¤Þ¤¹¡¥See Comparing Directories.

-X file
--exclude-from=file

¥Ç¥£¥ì¥¯¥È¥ê¤ÎÈæ³Ó»þ¤Ë¡¤¥Ù¡¼¥¹Ì¾¤¬file¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë¥Ñ¥¿¡¼¥ó¤Ë¥Þ¥Ã ¥Á¤¹¤ë¥Õ¥¡¥¤¥ë¤È¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤ò̵»ë¤·¤Þ¤¹¡¥See Comparing Directories.

-y
--side-by-side

²£¤Ëʤ٤¿½ñ¼°¤ò»ÈÍѤ·¤Þ¤¹¡¥See Side by Side Format.


Up: Invoking diff   [Contents][Index]