Next: , Up: rdiff   [Contents][Index]


A.14.1 rdiff ¤Î¥ª¥×¥·¥ç¥ó

rdiff ¤Ç¤Ï¡¢°Ê²¼¤Îɸ½à¥ª¥×¥·¥ç¥ó¤¬ÍøÍѤǤ­¤Þ¤¹ (´°Á´¤Êµ­½Ò¤Ï see Common options):

-D date

date °ÊÁ°¤ÎºÇ¤â¿·¤·¤¤¥ê¥Ó¥¸¥ç¥ó¤òÍøÍѤ·¤Þ¤¹¡£

-f

»ØÄꤷ¤¿¥ê¥Ó¥¸¥ç¥ó¤¬¸«ÉÕ¤«¤é¤Ê¤«¤Ã¤¿¾ì¹ç¡¢ (¤½¤Î¥Õ¥¡¥¤¥ë¤ò̵»ë¤»¤º¤Ë) ºÇ¤â¿·¤·¤¤¥ê¥Ó¥·¥ç¥ó¤òÍѤ¤¤Þ¤¹¡£

-l

Local¡¢¤Ä¤Þ¤ê¸½ºß¤Îºî¶È¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Î¤ß¥³¥Þ¥ó¥É¤¬ ¼Â¹Ô¤µ¤ì¤Þ¤¹¡£

-R

¥Ç¥£¥ì¥¯¥È¥ê¤òºÆµ¢Åª¤Ë¸¡ºº¤·¤Þ¤¹¡£ ¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï»ØÄꤷ¤Ê¤¯¤Æ¤â¼Â¹Ô¤µ¤ì¤Þ¤¹¡£

-r tag

tag ¤Ç»ØÄꤵ¤ì¤¿¥ê¥Ó¥¸¥ç¥ó¤òÍѤ¤¤Þ¤¹¡£

¤µ¤é¤Ë°Ê²¼¤Î¥ª¥×¥·¥ç¥ó¤â»ÈÍѲÄǽ¤Ç¤¹:

-c

Context ·Á¼°¤Ç½ÐÎϤ·¤Þ¤¹¡£ ¤³¤ì¤¬´ûÄê·Á¼°¤Ê¤Î¤Ç»ØÄꤹ¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£

-s

¥Ñ¥Ã¥Á¤ÎÂå¤ê¤ËÊѹ¹Í׻ݤÀ¤±¤¬Êó¹ð¤µ¤ì¤Þ¤¹¡£ »ØÄꤷ¤¿¥ê¥ê¡¼¥¹´Ö¤ÇÊѹ¹¤µ¤ì¤¿¤êÄɲ䵤줿¥Õ¥¡¥¤¥ë¤Î¾ðÊó¤¬ É¸½à½ÐÎϤËÁ÷¤é¤ì¤Þ¤¹¡£ ¤³¤ì¤ÏÎ㤨¤Ð¡¢Æó¤Ä¤ÎÆüÉÕ¤ä¥ê¥Ó¥¸¥ç¥ó´Ö¤ÇÊѹ¹¤µ¤ì¤¿ ¥Õ¥¡¥¤¥ë¤ò°ìÍ÷¤¹¤ë¤Î¤ËÊØÍø¤Ç¤¹¡£

-t

ÀèÆ¬¤Ë¤¢¤ëÆó¤Ä¤Î¥ê¥Ó¥¸¥ç¥ó´Ö¤Îº¹Ê¬¤òɸ½à½ÐÎϤËÁ÷¤ê¤Þ¤¹¡£ ¤³¤ì¤Ï¡¢¤½¤Î¥Õ¥¡¥¤¥ë¤ÎºÇ¿·¤ÎÊѹ¹ÅÀ¤ò¸«¤ë¤È¤­¤Ë»È¤¤¤Þ¤¹¡£

-u

Context ·Á¼°¤Ç¤Ï¤Ê¤¯¡¢unidiff ·Á¼°¤òÍѤ¤¤Þ¤¹¡£ ¸Å¤¤¥Ð¡¼¥¸¥ç¥ó¤Î patch ¥×¥í¥°¥é¥à¤Ï unidiff ·Á¼°¤ò°·¤¨¤Ê¤¤¤Î¤Ç¡¢ ¥Ñ¥Ã¥Á¤ò¥Í¥Ã¥È¤ËÅê¹Æ¤¹¤ë¤Ä¤â¤ê¤Ê¤é¤Ð¡¢ ‘-u’ ¤ò»ÈÍѤ·¤Ê¤¤Êý¤¬¸­ÌÀ¤Ç¤·¤ç¤¦¡£

-V vn

RCS ¤Î¥Ð¡¼¥¸¥ç¥ó vn ¤Ë¤ª¤±¤ëŸ³«ÊýË¡¤Ë½¾¤Ã¤Æ¡¢ ¥­¡¼¥ï¡¼¥É¤òŸ³«¤·¤Þ¤¹ (RCS ¤Î¥Ð¡¼¥¸¥ç¥ó 5 ¤ÇŸ³«ÊýË¡¤¬Êѹ¹¤µ¤ì¤Þ¤·¤¿)¡£ ¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¤â¤¦»ÈÍѤǤ­¤Ê¤¤¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£ CVS ¤Ï RCS ¥Ð¡¼¥¸¥ç¥ó 5 ¤¬¤¹¤ë¤è¤¦¤Ë¾ï¤Ë¥­¡¼¥ï¡¼¥É¤òŸ³«¤·¤Þ¤¹¡£