diff 2

[Linux]Diff ๋ช…๋ น์œผ๋กœ ํŒŒ์ผ ๋น„๊ตํ•˜๊ธฐ

์ €๋Š” ์–ด๋ฆด ์  ํ”„๋กœ๊ทธ๋ž˜๋จธ๋ผ๊ณ  ์ƒ๊ฐํ•˜๋ฉด ๋ฉ”ํŠธ๋ฆญ์Šค์˜ ํ™”๋ฉด์ด ์ƒ๊ฐ๋‚ฉ๋‹ˆ๋‹คใ…Žใ…Ž ๊ฒ€์ • ํ™”๋ฉด์— ์•Œ์ˆ˜์—†๋Š” ๊ฒ€์ •์ƒ‰ ์ˆซ์ž๋“ค์ด ์ฃผ๋ฅด๋ฅต ์จ์ ธ์žˆ์—ˆ์ฃ . ๊ทธ ์ดํ›„ ํ”„๋กœ๊ทธ๋žจ์— ์กฐ๊ธˆ ์•Œ๊ฒŒ ๋˜์—ˆ์„ ๋• ๊ฒ€์ • ํ™”๋ฉด์— ์•Œ์ˆ˜์—†๋Š” ๊ธ€์ž๋“ค์ด ์ดˆ๋ก๋นจ๊ฐ•ํฐ์ƒ‰์œผ๋กœ ๋„๋ฐฐ๋˜์–ด ์žˆ๋Š” ํ™”๋ฉด์ด ๋– ์˜ค๋ฅด๋”๊ตฐ์š”. ์ด๋ฒˆ์— ํšŒ์‚ฌ์—์„œ ์‹œ๋‹ˆ์–ด๊ธ‰ ํ”„๋ฆฌ ํ•œ๋ถ„์ด ์ €์™€ ๊ฐ™์€ ํŒ€์œผ๋กœ ๋ฐฐ์ •๋˜์—ˆ์Šต๋‹ˆ๋‹ค. ์ €๋Š” ์ดํด๋ฆฝ์Šค์˜ git synchronize์˜ gui ํ™”๋ฉด์—์„œ ์‚ฌ์šฉํ–ˆ์—ˆ๋Š”๋ฐ ์ด๋ถ„์€ ๊นƒ์„ ์˜ค๋ž˜ ์‚ฌ์šฉํ•˜์…จ๋Š”์ง€ gitbash์—์„œ ๋ชจ๋“  ์ž‘์—…์„ ํ•˜๋”๊ตฐ์š”. ์•„... ๊ทธ ์–ด์ฐŒ๋‚˜ ๋ฉ‹์ ธ ๋ณด์ด๋˜์ง€ ๊ณ„์†ํ•ด์„œ ๊ทธ ์žฅ๋ฉด์ด ์ œ ๋จธ๋ฆฌ์†์„ ๋– ๋‚˜์ง€ ์•Š๋”๋ผ๊ตฌ์š”... ๊ทธ๋ž˜์„œ ์ € ์—ญ์‹œ mac์—์„œ๋Š” terminal์˜ command๋ฅผ, window์—์„œ๋Š” gitbash๋ฅผ ํ™œ์šฉํ•œ ๋ช…๋ น์œผ๋กœ ์ž‘์—…๋“ค์„ ์ง„ํ–‰ํ•ด ๋ณด๊ณ  ์‹ถ๋”๊ตฐ์š”. ๊ทธ ์ฒซ ..

OS/Linux 2022.02.19

[Git] git command ์ •๋ฆฌ.

List git diff git log etc Notice [something]์˜ [ ] ํ‘œ์‹œ๋Š” ์ƒ๋žตํ•ด๋„ ๋œ๋‹ค๋Š” ์˜๋ฏธ์ž…๋‹ˆ๋‹ค. ์˜ ํ‘œ์‹œ๋Š” ์ƒ๋žตํ•˜๋ฉด ์•ˆ๋˜๊ณ  something์ž๋ฆฌ์— ์ง€์นญํ•˜๋Š” ๊ฐ’์„ ๋„ฃ์œผ์…”์•ผ ํ•ฉ๋‹ˆ๋‹ค. git diff git pull ํ•˜๊ธฐ ์ „์— ๋ฆฌ๋ชจํŠธ์™€์˜ ๋ณ€๊ฒฝ์  ํ™•์ธํ•˜๊ธฐ git diff HEAD /local์˜ ์ตœ์‹  commit๊ณผ remote repo์™€์˜ ๋ณ€๊ฒฝ์ ์„ ๋ณผ ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค. e.g) git diff HEAD origin/master git fetch ์ดํ›„ ์‚ฌ์šฉ git push ํ•˜๊ธฐ ์ „์— ๋ฆฌ๋ชจํŠธ์™€์˜ ๋ณ€๊ฒฝ์  ํ™•์ธํ•˜๊ธฐ git diff / HEADlocal์˜ ์ตœ์‹  commit๊ณผ remote repo์™€์˜ ๋ณ€๊ฒฝ์ ์„ ๋ณผ ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค. (์‹คํ–‰ ๊ฒฐ๊ณผ๋Š” ์œ„์™€ ๋™์ผํ•œ ๊ฒƒ์œผ๋กœ ๋ณด์ž…๋‹ˆ๋‹ค.) git add ์ „์— ๋ณ€๊ฒฝ์ ..

Tools 2021.09.29
728x90
๋ฐ˜์‘ํ˜•