DIFF

Section: GNU Tools (1)
Updated: 1993³â 9¿ù 22ÀÏ
Index HOME
 

À̸§

diff - µÎ ÆÄÀÏ¿¡¼­ Â÷ÀÌÁ¡À» ã´Â´Ù.  

»ç¿ë¹ý

diff [options] from-file to-file  

¼³¸í

°£´ÜÇÑ ¿¹·Î, diff ´Â from-file ¿Í to-file ÀÇ µÎÆÄÀÏÀÇ ³»¿ëÀ» ºñ±³ÇÑ´Ù. - ÀÇ ÆÄÀϸíÀº Ç¥ÁØÀÔ·ÂÀ¸·ÎºÎÅÍ Àоîµé¿© ³»¿ëÀ» ³ªÅ¸³½´Ù. Ưº°ÇÑ °æ¿ì·Î, diff - - ´Â ÀÚ±â ÀÚ½ÅÀ» Ç¥ÁØÀÔ·ÂÀ¸·Î ºñ±³ÇÑ´Ù. If from-file ÀÌ µð·ºÅ丮À̰í, to-file ÀÌ ¾Æ´Ï¶ó¸é diff ´Â to-fileÀÇ ÆÄÀϰú from-file¾ÈÀÇ ÆÄÀÏÀ» ºñ±³ÇÑ´Ù. from-file °ú to-file ÀÌ ¸ðµÎ µð·ºÅ丮¶ó¸é, diff ´Â ¾ËÆÄºª ¼ø¼­·Î µÎ µð·ºÅ丮 ¾ÈÀÇ »óÀÀÇÏ´Â ÆÄÀÏÀ» ºñ±³ÇÑ´Ù; ÀÌ ºñ±³´Â -rÀ̳ª -recursive¿É¼ÇÀÌ ÁÖ¾îÁöÁö ¾ÊÀ¸¸é Àç±ÍÀûÀÌ ¾Æ´Ï´Ù. diff ´Â ÆÄÀÏÀÎ¾ç ½ÇÁ¦ µð·ºÅ丮¸¦ ºñ±³ÇÏÁö´Â ¾Ê´Â´Ù. Ç¥ÁØÀÔ·ÂÀº °°Àº À̸§À» °¡Áø ÆÄÀϰ³³äÀ» Àû¿ëÇÏÁö ¾Ê±â¶§¹®¿¡ ²ËÂù ÆÄÀÏÀº Ç¥ÁØÀԷµÇÁö ¾ÊÀ» ¼ö ÀÖ´Ù. diff Àº -, ·Î ½ÃÀ۵ȴÙ, ±×·¡¼­ ´ë°Ô from-file °ú to-file Àº - ·Î ½ÃÀÛµÇÁö ¾ÊÀ»·±Áö ¸ð¸¥´Ù.  

Options

¾Æ·¡´Â ±×´º diff¿¡¼­ ¾²ÀÌ´Â ¸ðµç ¿É¼ÇµéÀÇ ¿ä¾àÀÌ´Ù. ´ëºÎºÐÀÇ ¿É¼ÇÀº µÎ°³ÀÇ À̸§À» °®´Â´Ù. Çϳª´Â -¿¡ ¾Õ¼­´Â ´ÜÀÏ ¹®ÀÚÀ̰í, ´Ù¸¥ Çϳª´Â --¿¡ ¾Õ¼­´Â ±ä À̸§ÀÌ´Ù. º¹¼öÀÇ ´ÜÀÏ ¹®ÀÚ ¿É¼ÇÀº ´ÜÀÏ ¸í ·ÉÇà¿¡ °áÇÕµÉ ¼ö ÀÖ´Ù: -ac´Â -a-c¿Í °°´Ù. ±ä À̸§ÀÇ ¿É¼ÇÀº ±× À̸§ÀÇ Æ¯Á¤ºÎºÐ¸¸À¸·Î ÁÙ¿© ¾µ¼ö°¡ ÀÖ´Ù. ´ë°ýÈ£ ([ ¿Í ]) Àº ¿É¼ÇÀÌ ÀÓÀÇÀÇ ÀÎÀÚ¸¦ °®´Â´Ù´Â °ÍÀ» °¡¸®Å²´Ù.
-lines
¹®¸ÆÀÇ ¶óÀÎÀ» º¸¿©ÁØ´Ù. ÀÌ ¿É¼ÇÀº Àڽſ¡ÀÇÇØ Ãâ·ÁÇüÀ¸·Î ÁöÁ¤µÇÁö ¾Ê] ´Â´Ù; -c³ª -u¾øÀÌ´Â ¾Æ¹«·± È¿°ú°¡ ¾ø´Ù. À̿ɼÇÀº Á¤È®ÇÏ´Ù. ÀûÀýÇÏ°Ô »ç¿ëÇÏ¸é ÆÐÄ¡´Â Àû¾îµµ ³»¿ëÀÇ µÎÇàÁ¤µµ´Â ÇÊ¿äÇÏ´Ù.
-a
ÅØ½ºÆ®°°¾Æ º¸ÀÌÁö ¾Ê¾Æµµ ÅØ½ºÆ®·Î µÈ ¸ðµç ÆÄÀÏÀ» ´Ù·ç°í Çà°£ ºñ±³¸¦ ÇÑ´Ù.
-b
ºó°ø°£ ÃÑ·®ÀÇ º¯È­¸¦ ¹«½ÃÇÑ´Ù.
-B
ºóÇà¿¡ »ðÀÔÇϰųª »èÁ¦¿Í °°Àº º¯È­¸¦ ¹«½ÃÇÑ´Ù.
--brief
´ëÃæÀÇ ÆÄÀÏ ´Ù¸¥Á¡À» º¸°íÇÑ´Ù.
-c
³»¿ë Ãâ·ÂÆûÀ» »ç¿ëÇÑ´Ù.
-C lines

--context[=lines]
´Â context·Î Ãâ·ÂÇÑ´Ù. Use the context output format, showing lines (an integer) lines of context, or three if lines is not given. For proper operation, patch typically needs at least two lines of context.
--changed-group-format=format
if-then-else Æ÷¸ËÀÇ µÎ ÆÄÀÏ·Î ºÎÅÍ ´Ù¸¥ ÇàÀ» Æ÷ÇÔÇÏ´Â Çà±×·ìÀ» Ãâ·ÂÇÏ´Â Æ÷¸ËÀ» »ç¿ëÇÑ´Ù.
-d
¾ÆÁÖ Á¶±×¸¶ÇÑ º¯È­¶óµµ ãµµ·Ï ¾Ë°í¸®ÁòÀ» ¹Ù²Û´Ù. ÀÌ ¿É¼ÇÀº diffÀÇ ¼öÇà ¼Óµµ¸¦ ¾ÆÁÖ ´À¸®°Ô ÇÑ´Ù.
-D name
-e

--ed
À¯È¿ÇÑ ed ½ºÅ©¸³Æ® Ãâ·ÂÀ» ÇÑ´Ù.
--exclude=pattern
µð·ºÅ丮¸¦ ºñ±³ÇÒ¶§, ÆÄÀϰú ¼­ºêµð·ºÅ丮ÀÇ basenameÀÌ pattern°ú ÀÏÄ¡ ÇÏ¸é ¹«½ÃÇÑ´Ù.
--exclude-from=file
µð·ºÅ丮¸¦ ºñ±³ÇÒ¶§, ÆÄÀϰú ¼­ºêµð·ºÅ丮ÀÇ basenameÀÌ file¿¡ ÀÖ´Â ¾î¶°ÇÑ pattern °úµµ ÀÏÄ¡ÇÏ¸é ¹«½ÃÇÑ´Ù.
--expand-tabs
Ãâ·ÂÆÄÀÏ¿¡¼­ ÅÇÀÇ Á¤·ÄÀ» À§ÇØ Åǰø°£À» ³Ð°Ô ÇÑ´Ù.
-f
ed ½ºÅ©¸³Æ®¿Í °°ÀÌ ¸ðÈ£ÇÏ°Ô º¸¿©Ãâ·ÂÀ» ÇÏÁö¸¸, ÆÄÀÏ¿¡ ³ªÅ¸³­ ¼ø¼­´ë·Î Á¤µ·µÈ´Ù.
-F regexp
°¢°¢ÀÇ Â÷ÀÌÁ¡µéÀ» À§ÇØ context¿Í ƯÁ¤ÇÑ Æ÷¸Ë¿¡¼­ regexp¿Í ÀÏÄ¡ÇÏ´Â ¾ÕÀÇ ÇàÀ» ¸î°³ º¸¿©ÁØ´Ù.
--forward-ed
ed ½ºÅ©¸³Æ®¿Í °°ÀÌ ¸ðÈ£ÇÏ°Ô º¸¿©Ãâ·ÂÀ» ÇÏÁö¸¸, ÆÄÀÏ¿¡ ³ªÅ¸³­ ¼ø¼­´ë·Î Á¤µ·µÈ´Ù.
-h
ÇöÀç ÀÌ ¿É¼ÇÀº ¾²ÀÌÁö ¾Ê´Â´Ù; ´ÜÁö À¯´Ð½º¿¡ ȣȯÇϱâ À§ÇÔÀÌ´Ù.
-H
Å« ÆÄÀÏÀ» ºü¸£°Ô ó¸®Çϱ⠴ٷç±â À§ÇØ »ç¿ëµÈ´Ù.
--horizon-lines=lines
Do not discard the last lines lines of the common prefix and the first lines lines of the common suffix.
-i
Ignore changes in case; consider upper- and lower-case letters equivalent.
-I regexp
regexp¿Í ÀÏÄ¡ÇÏ´Â »ðÀÔ È¤Àº »èÁ¦ÇàÀÇ º¯È­¸¦ ¹«½ÃÇÑ´Ù.
--ifdef=name
ÇÁ¸®ÇÁ·Î¼¼¼­ÀÇ »óÅ¿¡ µû¶ó if-then-elseÆ÷¸Ë Ãâ·ÂÀ» ÇÕÄ£´Ù.
--ignore-all-space
ÇàÀ» ºñ±³ÇÒ¶§ °ø¹éÀ» ¹«½ÃÇÑ´Ù.
--ignore-blank-lines
°ø¹é¿¡ »ðÀÔ¶Ç´Â »èÁ¦ÀÇ º¯È­¸¦ ¹«½ÃÇÑ´Ù.
--ignore-matching-lines=regexp
regexp¿Í ÀÏÄ¡ÇÏ´Â »ðÀÔ,»èÁ¦ÇàÀ» ¹«½ÃÇÑ´Ù.
--ignore-space-change
°ø¹éÀÇ ¾çÀÇ º¯È­¸¦ ¹«½ÃÇÑ´Ù.
--initial-tab
Output a tab rather than a space before the text of a line in normal or context format. This causes the alignment of tabs in the line to look normal.
-l
prÀ» ÅëÇØ ÆäÀÌÁöÃâ·ÂÀ» ÇÑ´Ù.
-L label

--label=label
contextÆ÷¸Ë°ú ƯÁ¤(unified)Æ÷¸Ë Çì´õ´ë½Å ¶óº§À» »ç¿ëÇÑ´Ù.
--left-column
¾çÂÊ ÇàÁß ¿ÞÂÊ¿­¸¸À» Ãâ·ÂÇÑ´Ù.
--line-format=format
in-then-elseÆ÷¸ËÀÇ ¸ðµç ÀÔ·ÂÇà Ãâ·ÂÀ» Æ÷¸ËÇÑ´Ù.
--minimal
¾à°£ÀÇ ¼³Á¤º¯È­°¡ ÀÖÀ¸¸é ¾Ë°í¸®ÁòÀ» ¹Ù²Û´Ù. À̰ÍÀº diffÀÇ Ã³¸®¼Óµµ¸¦ ´ÊÃá´Ù.(Á¾Á¾ ¾ÆÁÖ ´À·ÁÁø´Ù.)
-n
RCS-Æ÷¸ËÀÇ Â÷ÀÌÁ¡À» Ãâ·ÂÇÑ´Ù;
-N

--new-file
ºñ±³ÇÏ´Â µð·ºÅ丮¿¡ ÆÄÀÏÀÌ ÇϳªÀÇ µð·ºÅ丮¿¡¸¸ ÀÖ´Ù¸é, ¸ðµÎ ÀÖ´Â °Íó·³ ó¸®¸¦ ÇÏÁö¸¸ »ç½ÇÀº ´Ù¸¥ ÇÑ µð·ºÅ丮¿¡´Â ÆÄÀÏÀÌ ¾ø´Ù.
-P
µð·ºÅ丮¸¦ ºñ±³ÇÒ¶§, µÎ°³ÀÇ µð·ºÅ丮Áß µÎ¹øÂ° µð·ºÅ丮¿¡¸¸ ÆÄÀÏÀÌ Á¸ÀçÇÑ´Ù¸é, ù¹øÂ° µð·ºÅ丮¿¡´Â »ç½Ç ÆÄÀÏÀÌ ¾øÁö¸¸ ÀÖ´Â °Íó·³ ó¸®ÇÑ´Ù.
--paginate
ÆäÀÌÁö´ÜÀ§·Î Ãâ·ÂÇÑ´Ù.
-q
µÎ ÆÄÀÏÀÇ ´Ù¸¥Á¡¸¸ Ãâ·ÂÇÑ´Ù.
-r
µÎ µð·ºÅ丮¸¦ ºñ±³ÇÒ¶§, ¸ðµç ¼­ºêµð·ºÅ丮´Â Àç±ÍÀûÀ¸·Î(recursively) ºñ±³ÇÑ´Ù.
--rcs
RCS-Æ÷¸Ë diffµéÀ» Ãâ·ÂÇÑ´Ù.
--recursive
µÎ µð·ºÅ丮¸¦ ºñ±³ÇÒ¶§, ¸ðµç ¼­ºêµð·ºÅ丮´Â Àç±ÍÀûÀ¸·Î(recursively) ºñ±³ÇÑ´Ù.
--report-identical-files

-s
µÎ ÆÄÀÏÀÌ °°À» ¶§ º¸°í(report)ÇÑ´Ù.
-S file
When comparing directories, start with the file file. This is used for resuming an aborted comparison.
--sdiff-merge-assist
sdiffÀÇ Á¤º¸¸¦ Ãâ·ÂÇÑ´Ù. sdiff ´Â sdiff°¡ diff¸¦ ½ÇÇàÇÒ¶§ ÀÌ ¿É¼ÇÀ» »ç¿ëÇÑ´Ù. ÀÌ ¿É¼ÇÀº Á÷Á¢ »ç¿ëÇÏ°í ½ÍÀº »ç¿ëÀÚ¸¦ À§ÇØ ¾²ÀδÙ.
--show-function-line=regexp
°¢°¢ÀÇ Â÷ÀÌÁ¡µéÀ» À§ÇØ context¿Í ƯÁ¤ÇÑ Æ÷¸Ë¿¡¼­ regexp¿Í ÀÏÄ¡ÇÏ´Â ¾ÕÀÇ ÇàÀ» ¸î°³ º¸¿©ÁØ´Ù.
--side-by-side
µÎ°³ÀÇ ºñ±³´ë»óÀ» ³ª¶õÈ÷ Ãâ·ÂÇÑ´Ù.
--starting-file=file
µð·ºÅ丮¸¦ ºñ±³ÇÒ¶§, file ºÎÅÍ ½ÃÀÛÇÑ´Ù. À̰ÍÀº abortµÈ ºñ±³¸¦ ´Ù½Ã ½ÃÀÛÇϱâ À§ÇØ »ç¿ëµÈ´Ù.
--suppress-common-lines
µÎ°³ÀÇ Æ÷¸Ë¿¡¼­ °øÅëµÈ ÇàÀº Ãâ·ÂÇÏÁö ¾Ê´Â´Ù.
-t
ÀÔ·Â ÆÄÀÏ¿¡¼­ ÅÇÀÇ Á¤·ÄÀ» ÁöÅ°ÇØ À§ÇØ Ãâ·Â½Ã ÅÇÀÇ °ø°£À» È®ÀåÇÑ´Ù.
-T
Output a tab rather than a space before the text of a line in normal or context format. This causes the alignment of tabs in the line to look normal.
--text
¸ðµç ÆÄÀÏÀ» ÅØ½ºÆ®·Î½á ´Ù·ç°í, Çà´ëÇà(line-by-line)À» ºñ±³ÇÑ´Ù.
-u
ÅëÀÏµÈ Ãâ·ÂÆ÷¸ËÀ» »ç¿ëÇÑ´Ù.
--unidirectional-new-file
µð·ºÅ丮¸¦ ºñ±³ÇÒ¶§, µÎ°³ÀÇ µð·ºÅ丮Áß µÎ¹øÂ° µð·ºÅ丮¿¡¸¸ ÆÄÀÏÀÌ Á¸ÀçÇÑ´Ù¸é, ù¹øÂ° µð·ºÅ丮¿¡´Â »ç½Ç ÆÄÀÏÀÌ ¾øÁö¸¸ ÀÖ´Â °Íó·³ ó¸®ÇÑ´Ù.
-U lines

--unified[=lines]
Use the unified output format, showing lines (an integer) lines of context, or three if lines is not given. For proper operation, patch typically needs at least two lines of context.
-v

--version
diff ÀÇ ¹öÀüÀ» Ãâ·ÂÇÑ´Ù.
-w
µÎ ÇàÀÇ ºñ±³½Ã °ø¹éÀ» ¹«½ÃÇÑ´Ù.
-W columns

--width=columns
Use an output width of columns in side by side format.
-x pattern
µð·ºÅ丮µéÀÇ ºñ±³½Ã, pattern °ú ÀÏÄ¡ÇÏ´Â ÆÄÀϰú ¼­ºêµð·ºÅ丮¸¦ ¹«½ÃÇÑ´Ù.
-X file
µð·ºÅ丮 ºñ±³½Ã, file ¿¡ Æ÷ÇÔµÈ ¸ðµç ÇüÅÂ¿Í ÀÏÄ¡ÇÏ´Â ÆÄÀϰú ¼­ºêµð·ºÅ丮¸¦ ¹«½ÃÇÑ´Ù.
-y
Use the side by side output format.
 

°ü·Ã Ç׸ñ

cmp(1), comm(1), diff3(1), ed(1), patch(1), pr(1), sdiff(1).  

Áø´Ü

Á¾·á½Ã 0Àº Â÷ÀÌÁ¡ÀÌ ¾ø´Â °ÍÀ̰í, 1À» Â÷ÀÌÁ¡ÀÌ ÀÖ°í, 2´Â ¹®Á¦°¡ ¹ß»ýÇÑ °ÍÀ» ÀǹÌÇÑ´Ù.  

¿ªÀÚ

ASPLINUX<man@asp-linux.co.kr>, 2000³â 7¿ù 29ÀÏ


 

Index

À̸§
»ç¿ë¹ý
¼³¸í
Options
°ü·Ã Ç׸ñ
Áø´Ü
¿ªÀÚ