diff.md 926 B

diff

ํŒŒ์ผ๋“ค๊ณผ ๋””๋ ‰ํ† ๋ฆฌ๋“ค์„ ๋น„๊ตํ•œ๋‹ค.

  • ํŒŒ์ผ๋“ค ๋น„๊ตํ•˜๊ธฐ (์ด์ „_ํŒŒ์ผ๋ช…์„ ์ƒˆ_ํŒŒ์ผ๋ช…์œผ๋กœ ๋ฐ”๊พธ๋Š” ๋ณ€๊ฒฝ์ ๋“ค ๋ชฉ๋ก):

diff {{์ด์ „_ํŒŒ์ผ๋ช…}} {{์ƒˆ_ํŒŒ์ผ๋ช…}}

  • ๊ณต๋ฐฑ๋“ค์„ ๋ฌด์‹œํ•˜๊ณ , ํŒŒ์ผ๋“ค ๋น„๊ตํ•˜๊ธฐ:

diff -w {{์ด์ „_ํŒŒ์ผ๋ช…}} {{์ƒˆ_ํŒŒ์ผ๋ช…}}

  • ์ฐจ์ด์ ๋“ค์„ ๋‚˜๋ž€ํžˆ ๋ณด์—ฌ์ฃผ๋Š” ํŒŒ์ผ๋“ค ๋น„๊ตํ•˜๊ธฐ:

diff -y {{์ด์ „_ํŒŒ์ผ๋ช…}} {{์ƒˆ_ํŒŒ์ผ๋ช…}}

  • ํ†ตํ•ฉ๋œ ํฌ๋งท์˜ ์ฐจ์ด์ ๋“ค ํ‘œ์‹œํ•˜๋ฉฐ ํŒŒ์ผ๋“ค ๋น„๊ตํ•˜๊ธฐ (git diff์—์„œ ์‚ฌ์šฉ๋˜๋Š” ๊ฒƒ ๊ฐ™์ด):

diff -u {{์ด์ „_ํŒŒ์ผ๋ช…}} {{์ƒˆ_ํŒŒ์ผ๋ช…}}

  • ์žฌ๊ท€์ ์œผ๋กœ ๋””๋ ‰ํ† ๋ฆฌ๋“ค ๋น„๊ตํ•˜๊ธฐ (๋‹ค๋ฅธ ํŒŒ์ผ/๋””๋ ‰ํ† ๋ฆฌ๋“ค์˜ ์ด๋ฆ„ ๋ฐ ํŒŒ์ผ์— ๋Œ€ํ•œ ๋ณ€๊ฒฝ์  ์ถœ๋ ฅ):

diff -r {{์ด์ „_๋””๋ ‰ํ† ๋ฆฌ๋ช…}} {{์ƒˆ_๋””๋ ‰ํ† ๋ฆฌ๋ช…}}

  • ๋””๋ ‰ํ† ๋ฆฌ๋“ค์„ ๋น„๊ตํ•˜๊ณ , ์„œ๋กœ ๋‹ค๋ฅธ ํŒŒ์ผ์ด๋ฆ„๋งŒ ํ‘œ์‹œํ•˜๊ธฐ:

diff -rq {{์ด์ „_๋””๋ ‰ํ† ๋ฆฌ๋ช…}} {{์ƒˆ_๋””๋ ‰ํ† ๋ฆฌ๋ช…}}