๐Ÿ—„๏ธ git

๐Ÿ—„๏ธ git

[git] 06 - ์ž‘์—… ์ž„์‹œ ์ €์žฅํ•˜๊ธฐ (stash)

๋”๋ณด๊ธฐ ์ด ๋ช…๋ น์–ด๋Š” ์–ธ์ œ ์“ฐ์ผ๊นŒ? ์—ฌ๋Ÿฌ ํŒŒ์ผ์„ ์ž‘์—…ํ•˜๊ณ  ์žˆ๋Š”๋ฐ ๋ˆ„๊ฐ€ ํŠน์ • ํŒŒ์ผ ์ž‘์—… ๋‹ค ๋์œผ๋ฉด ์šฐ์„  ์ ์šฉํ•ด๋‹ฌ๋ผ๊ณ  ํ•  ๋•Œ ๋“ฑ๋“ฑ ์—ฌ๋Ÿฌ ์ƒํ™ฉ์ด ์žˆ๋‹ค. ๋ธ”๋กœ๊ทธ๋ฅผ ์ž‘์„ฑํ•˜๋‹ค๊ฐ€๋„ ์ž„์‹œ์ €์žฅํ•˜๋Š” ๊ฒฝ์šฐ๊ฐ€ ์žˆ๋Š”๋ฐ ๊ฐ™์€ ๊ธฐ๋Šฅ์ด๋ผ๊ณ  ์ƒ๊ฐํ•˜๋ฉด ๋  ๊ฒƒ ๊ฐ™๋‹ค. stash ํ•ด๋‹น ๋ช…๋ น์–ด๋Š” ๋ณ€๊ฒฝ ์‚ฌํ•ญ์„ ์ž„์‹œ ์ €์žฅํ•˜๋Š” ๋ช…๋ น์–ด๋‹ค. git statsh ์•„๋ž˜์˜ ์‚ฌ์ง„๊ณผ ๊ฐ™์ด ๊ธฐ์กด์— "create a.txt" ๋ผ๋Š” ๋‚ด์šฉ์ด ์ž‘์„ฑ๋˜์–ด ์žˆ๋Š” ํŒŒ์ผ์— "modify a.txt" ๋ผ๋Š” ๋‚ด์šฉ์„ ์ถ”๊ฐ€ํ•˜์—ฌ ์ž„์‹œ์ €์žฅ ํ•ด๋ณด์ž. ํ…์ŠคํŠธ ํŒŒ์ผ์„ ์ €์žฅํ•œ ํ›„, git status ๋ฅผ ํ™•์ธํ•ด๋ณด๋ฉด ์•„๋ž˜์˜ ์‚ฌ์ง„๊ณผ ๊ฐ™์ด ๋ณ€๊ฒฝ ์‚ฌํ•ญ์ด stage์— ์˜ฌ๋ผ๊ฐ€์ง€ ์•Š์•˜๋‹ค๊ณ  ๋‚˜์˜ฌ ๊ฒƒ์ด๋‹ค. ์ด ์ƒํ™ฉ์—์„œ ์ปค๋ฐ‹์€ ํ•˜์ง€์•Š๊ณ  ์ž„์‹œ์ €์žฅ์„ ํ•˜๊ธฐ ์œ„ํ•ด์„œ stash ๋ช…๋ น์–ด๋ฅผ ์‚ฌ์šฉํ•œ๋‹ค. git stash --m..

๐Ÿ—„๏ธ git

[git] 05 - ์ปค๋ฐ‹ ๋˜๋Œ๋ฆฌ๊ธฐ (revert, reset)

revert ํ•ด๋‹น ๋ช…๋ น์–ด๋Š” ์ด์ „ ์ปค๋ฐ‹์„ ์ƒˆ ์ปค๋ฐ‹์œผ๋กœ ์ถ”๊ฐ€ํ•˜๋Š” ๋ช…๋ น์–ด๋‹ค. git revert ํ˜„์žฌ a.txt ํŒŒ์ผ์— "git diff test" ๋ผ๋Š” ๋‚ด์šฉ์ด ์ž…๋ ฅํ•˜๊ณ  ์ปค๋ฐ‹์„ ํ–ˆ๋Š”๋ฐ, ์ด์ „ ์ปค๋ฐ‹์œผ๋กœ ๋˜๋Œ๋ ค๋ณด์ž. ํ•ด๋‹น ๋ช…๋ น์–ด๋ฅผ ์ž…๋ ฅํ•˜๋ฉด ์•„๋ž˜์˜ ์‚ฌ์ง„๊ณผ ๊ฐ™์ด ์ปค๋ฐ‹ ๋ฉ”์‹œ์ง€๋ฅผ ์ž…๋ ฅํ•˜๋„๋ก vi ํŽธ์ง‘๊ธฐ๊ฐ€ ์ž๋™์œผ๋กœ ์—ด๋ฆฌ๊ฒŒ ๋˜๋Š”๋ฐ ์šฐ๋ฆฌ๊ฐ€ ์•ž์„œ ์ปค๋ฐ‹์„ ํ•˜๋ฉด ๋ฐ˜๋“œ์‹œ ์ปค๋ฐ‹ ๋ฉ”์‹œ์ง€๋ฅผ ์ž…๋ ฅํ•ด์•ผ ํ•œ๋‹ค๊ณ  ํ–ˆ๋‹ค. revert๋Š” ์ด์ „ ์ปค๋ฐ‹์„ ์ƒˆ ์ปค๋ฐ‹์œผ๋กœ ์ถ”๊ฐ€ํ•˜๋Š” ๋ช…๋ น์–ด๊ธฐ ๋•Œ๋ฌธ์— ์ปค๋ฐ‹ ๋ฉ”์‹œ์ง€๋ฅผ ์ž…๋ ฅํ•˜๋„๋ก ์ž๋™์œผ๋กœ ํŽธ์ง‘๊ธฐ๊ฐ€ ์—ด๋ฆฐ๋‹ค. ๊ทธ๋ž˜์„œ Revert "diff test" ์ปค๋ฐ‹์€ diff test๋ฅผ ์ด์ „์œผ๋กœ ๋˜๋Œ๋ฆฐ ์ปค๋ฐ‹์ด ๋œ๋‹ค. (์•„๋ž˜ ์‚ฌ์ง„์„ ๋ณด๊ณ  ๊ฐ„๋‹จํ•˜๊ฒŒ ์„ค๋ช…ํ•˜์ž๋ฉด Revert "diff test" ์ปค๋ฐ‹์€ first commit ๊ณผ ๊ฐ™์€ ๋‚ด..

๐Ÿ—„๏ธ git

[git] 04 - ์ปค๋ฐ‹ ๋น„๊ต (diff)

diff ํ•ด๋‹น ๋ช…๋ น์–ด๋Š” ์ตœ๊ทผ ์ปค๋ฐ‹๊ณผ ์ž‘์—… ๋””๋ ‰ํ„ฐ๋ฆฌ ๋‚ด์˜ ๋ณ€๊ฒฝ์‚ฌํ•ญ์„ ๋น„๊ตํ•˜๋Š” ๋ช…๋ น์–ด๋‹ค. git diff ๋‚ด ์ž‘์—… ๋””๋ ‰ํ„ฐ๋ฆฌ์— ์•„๋ฌด๊ฒƒ๋„ ์ž…๋ ฅ๋˜์–ด ์žˆ์ง€ ์•Š์€ ๋นˆ ํ…์ŠคํŠธ ํŒŒ์ผ 'a.txt' ์ด ์žˆ๋Š”๋ฐ, ์ด ํ…์ŠคํŠธ ํŒŒ์ผ์— "git diff test" ๋ผ๊ณ  ๋‚ด์šฉ์„ ์ž…๋ ฅ ํ›„ ์ปค๋ฐ‹ํ•˜์ง€ ์•Š์€ ์ƒํƒœ์—์„œ ํ•ด๋‹น ๋ช…๋ น์–ด๋ฅผ ์ž…๋ ฅํ–ˆ๋”๋‹ˆ ์•„๋ž˜์˜ ์‚ฌ์ง„๊ณผ ๊ฐ™์€ ๊ฒฐ๊ณผ๊ฐ€ ๋‚˜์™”๋‹ค. ๋‚ด ๋งˆ์ง€๋ง‰ ์ปค๋ฐ‹์€ ์•„๋ฌด ๋‚ด์šฉ์ด ์ž…๋ ฅ๋˜์–ด ์žˆ์ง€ ์•Š์€ 'a.txt' ํŒŒ์ผ์ด ์žˆ๊ณ , ์ด ์ปค๋ฐ‹์„ ๊ธฐ์ค€์œผ๋กœ ๋‚ด ์ž‘์—… ๋””๋ ‰ํ„ฐ๋ฆฌ์—๋Š” "git diff test" ๋ผ๋Š” ๋‚ด์šฉ์ด ์ถ”๊ฐ€๋กœ ์ž…๋ ฅ๋๋‹ค๋Š” ๊ฒƒ์„ ์˜๋ฏธํ•œ๋‹ค. ๋งŒ์•ฝ, ์ปค๋ฐ‹์„ ํ•œ ํ›„์— ๋‹ค์‹œ diff ๋ช…๋ น์–ด๋ฅผ ์ž…๋ ฅํ•˜๋ฉด ์–ด๋–ป๊ฒŒ ๋ ๊นŒ? ๋‹น์—ฐํžˆ "git diff test" ๋‚ด์šฉ์ด ์ž…๋ ฅ๋œ a.txt๊ฐ€ ๋งˆ์ง€๋ง‰ ์ปค๋ฐ‹์ด ๋˜๊ธฐ ๋•Œ๋ฌธ์— ์ปค๋ฐ‹๊ณผ ์ž‘์—… ..

๐Ÿ—„๏ธ git

[git] 03 - ๋ฒ„์ „๊ด€๋ฆฌ (init, status, add, commit, log)

์ด์ œ ๋ณธ๊ฒฉ์ ์œผ๋กœ git์„ ํ†ตํ•ด ๋ฒ„์ „๊ด€๋ฆฌ๋ฅผ ํ•ด๋ณด๋„๋ก ํ•˜์ž. init ํ•ด๋‹น ๋ช…๋ น์–ด๋Š” ๋กœ์ปฌ ์ €์žฅ์†Œ๋ฅผ ๋งŒ๋“œ๋Š” ๋ช…๋ น์–ด๋‹ค. git init ํ•ด๋‹น ๋ช…๋ น์–ด๋ฅผ ์ž…๋ ฅํ•˜๋ฉด ํ˜„์žฌ ์œ„์น˜ํ•˜๊ณ  ์žˆ๋Š” ๋””๋ ‰ํ„ฐ๋ฆฌ๊ฐ€ ๊นƒ์œผ๋กœ ๊ด€๋ฆฌํ•˜๋Š” ๋กœ์ปฌ ์ €์žฅ์†Œ๊ฐ€ ๋œ๋‹ค. ์œ„์˜ ์‚ฌ์ง„๊ณผ ๊ฐ™์ด ls-al ์„ ์ž…๋ ฅํ–ˆ์„ ๋•Œ .git ํด๋”๊ฐ€ ์ƒ์„ฑ๋๋‹ค๋ฉด ์„ฑ๊ณต์ด๋‹ค. ๋˜๋Š” ํ•ด๋‹น ๋””๋ ‰ํ„ฐ๋ฆฌ๋กœ ์ด๋™ํ•˜๋ฉด ์—ฐ๋‘์ƒ‰์œผ๋กœ master๊ฐ€ ํ‘œ์‹œ๋˜๋Š”๋ฐ ๊ทธ๋ ‡๋‹ค๋ฉด ์ •์ƒ์ ์œผ๋กœ init์ด ๋๋‹ค๋Š” ๋œป์ด๋‹ค. status ํ•ด๋‹น ๋ช…๋ น์–ด๋Š” ์ž‘์—… ๋””๋ ‰ํ„ฐ๋ฆฌ์˜ ์ƒํƒœ๋ฅผ ํ™•์ธํ•˜๋Š” ๋ช…๋ น์–ด๋‹ค. git status ์˜ˆ๋ฅผ ๋“ค์–ด, init์„ ํ•œ ๋””๋ ‰ํ„ฐ๋ฆฌ์—์„œ a.txt ํŒŒ์ผ์„ ์ƒ์„ฑํ•œ ํ›„, git status๋ฅผ ์ž…๋ ฅํ•ด๋ณด์ž. ์œ„์˜ ์‚ฌ์ง„๊ณผ ๊ฐ™์ด ์ถ”์ ํ•˜์ง€ ์•Š๋Š” ํŒŒ์ผ์ด๋ผ๊ณ  ํ•ด์„œ ์ƒ์„ฑํ•œ a.txt ํŒŒ์ผ์ด ๋Œ€์ƒ์— ํฌํ•จ๋˜์–ด ์žˆ๋‹ค. ์•ž์„  ๊ธ€..

๐Ÿ—„๏ธ git

[git] 02 - ์ž‘์—… ๋””๋ ‰ํ„ฐ๋ฆฌ, ์Šคํ…Œ์ด์ง€, ์ €์žฅ์†Œ (Working Directory, Stage, Repository)

git์€ 3๊ฐœ์˜ ๊ณต๊ฐ„์ด ์žˆ๋‹ค. ์ž‘์—… ๋””๋ ‰ํ„ฐ๋ฆฌ (Working Directory) ์Šคํ…Œ์ด์ง€ (Stage) ์ €์žฅ์†Œ (Repository) 1. ์ž‘์—… ๋””๋ ‰ํ„ฐ๋ฆฌ (Working Directory) ๋ฒ„์ „ ๊ด€๋ฆฌ์˜ ๋Œ€์ƒ์ด ์œ„์น˜ํ•˜๋Š” ๊ณต๊ฐ„์ด๋‹ค. ์‰ฝ๊ฒŒ ๋งํ•ด์„œ ๋‚ด๊ฐ€ ์ž‘์—…์ค‘์ธ ์†Œ์Šค๋“ค์ด ์žˆ๋Š” ๋””๋ ‰ํ„ฐ๋ฆฌ๋ฅผ ๋งํ•œ๋‹ค. 2. ์Šคํ…Œ์ด์ง€ (Stage) ๋‹ค์Œ ๋ฒ„์ „์ด ๋  ํ›„๋ณด๊ฐ€ ์˜ฌ๋ผ๊ฐ€๋Š” ๊ณต๊ฐ„์ด๋‹ค. ์ปค๋ฐ‹์„ ํ•˜๊ธฐ ์ „์— ์ž‘์—… ๋””๋ ‰ํ„ฐ๋ฆฌ์—์„œ ์Šคํ…Œ์ด์ง€๋กœ ์˜ฌ๋ ค์•ผ ํ•œ๋‹ค. 3. ์ €์žฅ์†Œ (Repository) ์†Œ์Šค ํŒŒ์ผ๋“ค์˜ ๋ณ€๊ฒฝ ๋‚ด์—ญ๋“ค์ด ์ €์žฅ๋˜์–ด ์žˆ๋Š” ๊ณต๊ฐ„์ด๋‹ค. ์ปค๋ฐ‹์„ ํ•˜๊ฒŒ ๋˜๋ฉด ์ €์žฅ์†Œ๋กœ ์˜ฌ๋ผ๊ฐ€๊ฒŒ ๋œ๋‹ค. ์ €์žฅ์†Œ๋Š” ํฌ๊ฒŒ ๋‘ ๊ฐ€์ง€๋กœ ๋‚˜๋‰˜๋Š”๋ฐ ๋กœ์ปฌ ์ €์žฅ์†Œ๊ฐ€ ์žˆ๊ณ , ์›๊ฒฉ ์ €์žฅ์†Œ๊ฐ€ ์žˆ๋‹ค. ๋กœ์ปฌ ์ €์žฅ์†Œ๋Š” C๋“œ๋ผ์ด๋ธŒ๋ฅผ ์ƒ๊ฐํ•˜๋ฉด ๋  ๊ฒƒ ๊ฐ™๋‹ค. ์›๊ฒฉ ์ €์žฅ์†Œ๋Š” github๋ฅผ ์ƒ..

๐Ÿ—„๏ธ git

[git] 01 - git ์„ค์น˜ ๋ฐ ์„ค์ • (Mac OS)

Homebrew ์„ค์น˜ Homebrew๋Š” ํŒจํ‚ค์ง€ ๊ด€๋ฆฌ ์†Œํ”„ํŠธ์›จ์–ด์ธ๋ฐ, ํ•œ ๋งˆ๋””๋กœ ํ”„๋กœ๊ทธ๋žจ ์„ค์น˜๋ฅผ ๊ฐ„๋‹จํ•˜๊ฒŒ ํ•  ์ˆ˜ ์žˆ๋„๋ก ๋„์™€์ฃผ๋Š” ์†Œํ”„ํŠธ์›จ์–ด์ด๋‹ค. ๋งํฌ : https://brew.sh/index_ko Homebrew The Missing Package Manager for macOS (or Linux). brew.sh ํ•ด๋‹น ๋งํฌ์— ๋“ค์–ด๊ฐ€๋ฉด ์œ„์™€ ๊ฐ™์€ ์›นํŽ˜์ด์ง€๊ฐ€ ์—ด๋ฆฌ๋Š”๋ฐ Homebrew ์„ค์น˜ํ•˜๊ธฐ ์•„๋ž˜์— ์žˆ๋Š” ๋ช…๋ น์–ด๋ฅผ ๋ณต์‚ฌํ•œ๋‹ค. (๋ช…๋ น์–ด ์˜†์— ๋ฌธ์„œ ์•„์ด์ฝ˜์„ ํด๋ฆญํ•˜๋ฉด ๋ณต์‚ฌ๋œ๋‹ค.) ์‚ฌ์šฉํ•˜๊ณ  ์žˆ๋Š” ํ„ฐ๋ฏธ๋„์— ์ ‘์†ํ•ด์„œ ๋ช…๋ น์–ด๋ฅผ ๋ถ™์—ฌ๋„ฃ๊ณ  ์—”ํ„ฐ๋ฅผ ์นœ๋‹ค. ํŒจ์Šค์›Œ๋“œ๋ฅผ ์ž…๋ ฅํ•˜๋ผ๊ณ  ํ• ํ…๋ฐ, ํŒจ์Šค์›Œ๋“œ๋ฅผ ์ž…๋ ฅํ•ด์ค€๋‹ค. Homebrew ์„ค์น˜๊ฐ€ ๋๋‚˜๊ณ  ์ด์ œ git์„ ์„ค์น˜ํ•œ๋‹ค. git ์„ค์น˜ Homebrew๋ฅผ ์„ค์น˜ํ–ˆ๊ธฐ ๋•Œ๋ฌธ์—, git ์„ค์น˜๋Š” ..

๐Ÿ—„๏ธ git

CLI ๋ช…๋ น์–ด ์ •๋ฆฌ

3~4๋…„ ์ „์— Linux, Unix๋ฅผ ์ป์—ˆ๋Š”๋ฐ ํ•œ๋™์•ˆ ์•ˆ์“ฐ๋‹ˆ๊นŒ ๋ช…๋ น์–ด๋“ค์„ ๊นŒ๋จน๊ฒŒ ๋˜์–ด์„œ ๋‹ค์‹œ ์ •๋ฆฌํ•˜๊ณ ์ž ํ•œ๋‹ค. โ–ก ๋ช…๋ น์–ด๋Š” ๊ณ„์† ์ด ๊ธ€์— ์ถ”๊ฐ€๋  ์˜ˆ์ • cd (change directory) : ํŠน์ • ๋””๋ ‰ํ† ๋ฆฌ๋กœ ์ด๋™ํ•œ๋‹ค. cd .. : ์ƒ์œ„ ๋””๋ ‰ํ† ๋ฆฌ๋กœ ์ด๋™ cd / : ์ตœ์ƒ์œ„ ๋””๋ ‰ํ† ๋ฆฌ๋กœ ์ด๋™ cd ๊ฒฝ๋กœ : ํ•ด๋‹น ๊ฒฝ๋กœ๋กœ ์ด๋™ pwd (print working directory) : ํ˜„์žฌ ๋””๋ ‰ํ† ๋ฆฌ ์œ„์น˜๋ฅผ ๋ณด์—ฌ์ค€๋‹ค. ls (list) : ํ˜„์žฌ ๋””๋ ‰ํ† ๋ฆฌ ์•ˆ์— ์žˆ๋Š” ํŒŒ์ผ๋“ค์„ ๋ณด์—ฌ์ค€๋‹ค. ls -a : ์ˆจ๊ฒจ์ง„ ํŒŒ์ผ๊นŒ์ง€ ๋ชจ๋‘ ๋ณด์—ฌ์ค€๋‹ค. (์ˆจ๊ฒจ์ง„ ํŒŒ์ผ๋“ค์€ .์œผ๋กœ ์‹œ์ž‘ํ•จ) ls -l : ํŒŒ์ผ๋“ค์„ ๋ฆฌ์ŠคํŠธ ํ˜•์‹์œผ๋กœ ๋ณด์—ฌ์ค€๋‹ค. (ํŒŒ์ผ ๊ถŒํ•œ, ์ž‘์„ฑ์ž ๋“ฑ ์ •๋ณด๊ฐ€ ๋‚˜์˜ด) ls -al : ๋ชจ๋“  ํŒŒ์ผ๋“ค์„ ๋ฆฌ์ŠคํŠธ ํ˜•์‹์œผ๋กœ ๋ณด์—ฌ์ค€๋‹ค. mkd..

seonghye0n
'๐Ÿ—„๏ธ git' ์นดํ…Œ๊ณ ๋ฆฌ์˜ ๊ธ€ ๋ชฉ๋ก (2 Page)