Next: Patching Time Stamps, Previous: Imperfect, Up: Merging with patch [Contents][Index]
Æó¤Ä¤Î¥Ç¥£¥ì¥¯¥È¥ê¤òÈæ³Ó¤·¤Æ¤¤¤ë¤È¤¡¤°ìÊý¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë¸ºß¤·¤Æ¤¤¤ë¥Õ¥¡
¥¤¥ë¤¬¤â¤¦°ìÊý¤Ë¤Ï̵¤¤¤³¤È¤â¤¢¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡¥diff
¤Ë
-N¤ä--new-file¥ª¥×¥·¥ç¥ó¤òÍ¿¤¨¤ë¾ì¹ç¤ä¡¤
/dev/null¤È¤¤¤¦Ì¾Á°¤Î¥Õ¥¡¥¤¥ë¤ä¶õ¤Î¥Õ¥¡¥¤¥ë¡¤¤½¤·¤ÆEpoch
(1970-01-01 00:00:00 UTC)¤ÎÆüÉդΥե¡¥¤¥ë¤Ç¡¤¸Å¤¤¥Õ¥¡¥¤¥ë¤ä¿·¤·¤¤¥Õ¥¡¥¤
¥ë¤òÄ󶡤·¤¿¾ì¹ç¡¤diff
¤Ï¤³¤Î¥Õ¥¡¥¤¥ë¤ÎÆâÍÆ¤òÄɲä·¤¿¤êºï½ü¤·¤¿
¤ê¤·¤Þ¤¹¡¥¤½¤Î¤è¤¦¤Ê¥Ñ¥Ã¥Á¤¬Í¿¤¨¤é¤ì¤¿¤È¤¡¤patch
¤ÏÄ̾¿·¤·
¤¤¥Õ¥¡¥¤¥ë¤òºîÀ®¤·¤¿¤ê¡¤¸Å¤¤¥Õ¥¡¥¤¥ë¤òºï½ü¤·¤¿¤ê¤·¤Þ¤¹¡¥¤·¤«¤·¡¤
POSIX(see patch and POSIX)¤Ë½àµò¤¹¤ë¤È¤¡¤patch
¤Ï¸Å¤¤
¥Õ¥¡¥¤¥ë¤òºï½ü¤»¤º¡¤¶õ¤Ë¤·¤Æ»Ä¤·¤Þ¤¹¡¥-E¤ä
--remove-empty-files¥ª¥×¥·¥ç¥ó¤Ç¡¤¥Ñ¥Ã¥Á¤òŬÍѸå¤Ë¶õ¤Ë¤Ê¤ë½ÐÎÏ
¥Õ¥¡¥¤¥ë¤ò¡¤¥Ñ¥Ã¥Á¤¬¥Õ¥¡¥¤¥ë¤òºï½ü¤¹¤ë¤è¤¦¤Ë¤Ï¸«¤¨¤Ê¤¤¾ì¹ç¤Ç¤â
patch
¤Ïºï½ü¤·¤Þ¤¹¡¥
¥Ñ¥Ã¥Á¤¬´û¸¤Î¥Õ¥¡¥¤¥ë¤òºîÀ®¤¹¤ë¤è¤¦¤Ë¸«¤¨¤ë¾ì¹ç¡¤patch
¤Ï¥Ñ¥Ã
¥Á¤òŬÍѤ¹¤ëÁ°¤Ë¡¤³Îǧ¤Î¤¿¤á¿Ò¤Í¤Æ¤¤Þ¤¹¡¥