Next: , Up: Merging with patch   [Contents][Index]


10.1 patch¤ÎÆþÎϽñ¼°¤ÎÁªÂò

patch¤Ï¡¤¥Ñ¥Ã¥Á¥Õ¥¡¥¤¥ë¤Ç»ÈÍѤ·¤Æ¤¤¤ëdiff¤Î½ñ¼°¤ò¡¤ ¤½¤ÎÆâÍÆ¤òÄ´ºº¤·¤Æ·èÄꤷ¤Þ¤¹¡¥ÆÃÄê¤ÎÊ£»¨¤ÊÁ°Ã֥ƥ­¥¹¥È¤Î°ì¤Ä¤¬´Þ¤Þ¤ì¤Æ¤¤ ¤ë¥Ñ¥Ã¥Á¥Õ¥¡¥¤¥ë¤ËÂФ·¡¤patch¤¬¥Ñ¥Ã¥Á¥Õ¥¡¥¤¥ë¤òÆÃÄê¤Î½ñ¼°¤Îº¹ ʬ¤Ç¤¢¤ë¤È²ò¼á¤¹¤ë¤è¤¦¤Ë¡¤°Ê²¼¤Î¥ª¥×¥·¥ç¥ó¤Î°ì¤Ä¤ò»ÈÍѤ¹¤ëɬÍפ¬¤¢¤ë¤«¤â ¤·¤ì¤Þ¤»¤ó¡¥°Ê²¼¤Ç¥ê¥¹¥È¥¢¥Ã¥×¤·¤Æ¤¤¤ë½ÐÎϽñ¼°¤Ï¡¤patch¤¬Íý²ò ²Äǽ¤Ê¤â¤Î¤À¤±¤Ç¤¹¡¥

-c
--context

¼þ¤ê¤Îʸ¤ò»ÈÍѤ·¤¿º¹Ê¬¡¥

-e
--ed

ed¥¹¥¯¥ê¥×¥È¡¥

-n
--normal

Ä̾ï¤Îº¹Ê¬¡¥

-u
--unified

°ìÂ⽤·¤¿º¹Ê¬¡¥