Next: diff examples, Up: diff [Contents][Index]
diff
¤Ç¤Ï¡¢°Ê²¼¤Îɸ½à¥ª¥×¥·¥ç¥ó¤¬ÍøÍѤǤ¤Þ¤¹
(´°Á´¤Êµ½Ò¤Ï see Common options):
-D date
date °ÊÁ°¤ÎºÇ¤â¿·¤·¤¤¥ê¥Ó¥¸¥ç¥ó¤òÍøÍѤ·¤Þ¤¹¡£ ¤³¤Î¥ª¥×¥·¥ç¥ó¤òÈæ³Ó¤ËÍѤ¤¤¿»þ¤Î¸ú²Ì¤Ï ‘-r’ ¤ò»²¾È¤·¤Æ²¼¤µ¤¤¡£
-k kflag
kfalg ¤Ë½¾¤Ã¤Æ¥¡¼¥ï¡¼¥ÉÃÖ´¹¤ò¹Ô¤¤¤Þ¤¹¡£Keyword substitution, »²¾È¡£
-l
Local¡¢¤Ä¤Þ¤ê¸½ºß¤Îºî¶È¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Î¤ß¥³¥Þ¥ó¥É¤¬ ¼Â¹Ô¤µ¤ì¤Þ¤¹¡£
-R
¥Ç¥£¥ì¥¯¥È¥ê¤òºÆµ¢Åª¤ËÄ´¤Ù¤Þ¤¹¡£ ¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï»ØÄꤷ¤Ê¤¯¤Æ¤â¼Â¹Ô¤µ¤ì¤Þ¤¹¡£
-r tag
¥ê¥Ó¥¸¥ç¥ó tag ¤ÈÈæ³Ó¤·¤Þ¤¹¡£ ¥ª¥×¥·¥ç¥ó ‘-r’ ¤ÏºÇÂçÆó¤Ä¤Þ¤Ç»ÈÍѤǤ¤Þ¤¹¡£ ¥ª¥×¥·¥ç¥ó ‘-r’ ¤ò»ØÄꤷ¤Ê¤¤¾ì¹ç¡¢ ºî¶È¥Õ¥¡¥¤¥ë¤ò¤½¤ÎͳÍè¤È¤Ê¤Ã¤¿¥ê¥Ó¥¸¥ç¥ó¤ÈÈæ³Ó¤·¤Þ¤¹¡£ ¥ª¥×¥·¥ç¥ó ‘-r’ ¤ò°ì¤Ä»ØÄꤷ¤¿¾ì¹ç¡¢ »ØÄꤷ¤¿¥ê¥Ó¥¸¥ç¥ó¤Èºî¶È¥Õ¥¡¥¤¥ë¤È¤òÈæ³Ó¤·¤Þ¤¹¡£ ¥ª¥×¥·¥ç¥ó ‘-r’ ¤òÆó¤Ä»ØÄꤷ¤¿¾ì¹ç¡¢ »ØÄꤷ¤¿Æó¤Ä¤Î¥ê¥Ó¥¸¥ç¥ó¤òÈæ³Ó¤·¤Þ¤¹ (ºî¶È¥Õ¥¡¥¤¥ë¤¬·ë²Ì¤Ë±Æ¶Á¤òÍ¿¤¨¤ë¤³¤È¤Ï¤¢¤ê¤Þ¤»¤ó)¡£
°ì¤Ä¤â¤·¤¯¤ÏξÊý¤Î¥ª¥×¥·¥ç¥ó ‘-r’ ¤ò¡¢Á°½Ò¤Î ¥ª¥×¥·¥ç¥ó ‘-D date’ ¤È¸ò´¹¤¹¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£
°Ê²¼¤Î¥ª¥×¥·¥ç¥ó¤Ï½ÐÎϤνñ¼°¤ò»ØÄꤷ¤Þ¤¹¡£ °ÕÌ£¤Ï GNU diff ¤ÈƱ¤¸¤Ç¤¹¡£
-0 -1 -2 -3 -4 -5 -6 -7 -8 -9 --binary --brief --changed-group-format=arg -c -C nlines --context[=lines] -e --ed -t --expand-tabs -f --forward-ed --horizon-lines=arg --ifdef=arg -w --ignore-all-space -B --ignore-blank-lines -i --ignore-case -I regexp --ignore-matching-lines=regexp -h -b --ignore-space-change -T --initial-tab -L label --label=label --left-column -d --minimal -N --new-file --new-line-format=arg --old-line-format=arg --paginate -n --rcs -s --report-identical-files -p --show-c-function -y --side-by-side -F regexp --show-function-line=regexp -H --speed-large-files --suppress-common-lines -a --text --unchanged-group-format=arg -u -U nlines --unified[=lines] -V arg -W columns --width=columns