Skip to content

Commit

Permalink
docs : update 1-2_.md
Browse files Browse the repository at this point in the history
  • Loading branch information
Kimdonghyeon7645 committed Nov 12, 2020
1 parent 226e749 commit ffa9945
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions 1-2_ git의 4가지 μž‘μ—…μ˜μ—­.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
(괜히 λ¬Όμ–΄λ³Έλ‹€κ³  흔듀리지 말자)λ‹Ήμ—°νžˆ λ§žλŠ” 말인데, 크게보면 μœ„μ²˜λŸΌ **둜컬(local)κ³Ό 원격(remote)** 2κ°€μ§€μ§€λ§Œ,
μžμ„Έν•˜κ²ŒλŠ” 둜컬 μ €μž₯μ†Œ μ•ˆμ—μ„œλ§Œ 3가지 μ˜μ—­μœΌλ‘œ λ‚˜λ‰˜κΈ°μ—, **4가지 μž‘μ—…μ˜μ—­** 으둜 λ‚˜λ‰œλ‹€.

![κ·ΈλŸ°λ°μ§œμž”](https://user-images.githubusercontent.com/48408417/98898823-d2f63080-24f1-11eb-87b5-53e226a3c492.png)
![μ™€μš°](https://user-images.githubusercontent.com/48408417/98905140-4140f000-24fe-11eb-898e-be9088f079d7.png)
##### ν™”μ‚΄ν‘œμ— 쓰인 κΈ€μžλŠ” λ‹€λ¦„μ•„λ‹Œ, λ‹€λ₯Έ μ˜μ—­μœΌλ‘œ λ„˜μ–΄κ°ˆ λ•Œ μ‚¬μš©ν•˜λŠ” λͺ…령어듀이닀. (뒀에 μ°¨κ·Όμ°¨κ·Ό 배울 것듀이기도 ν•˜λ‹€.)


Expand All @@ -37,20 +37,20 @@ gitμ—μ„œλŠ” λ²„μ „μœΌλ‘œ 올릴 것듀을 선택할 수 μžˆλ‹€.
![μš”λ‘œμ½”λ‘¬](https://miro.medium.com/max/686/1*diRLm1S5hkVoh5qeArND0Q.png)

- ### working directory(=working tree)
λ‚΄ μ»΄ν“¨ν„°μ˜ 폴더 μ˜μ—­μ΄λ‹€. (걍 둜컬 μ €μž₯μ†Œ 폴더 μ•ˆμ— μžˆλ‹€κ³  λ‹€ μ‹€μ œ μ €μž₯μ†Œμ— μ €μž₯λ˜λŠ” 것이 μ•„λ‹ˆλ‹€.)
λ‚΄ μ»΄ν“¨ν„°μ˜ 폴더 μ˜μ—­μ΄λ‹€. (걍 둜컬 μ €μž₯μ†Œ 폴더 μ•ˆμ— μžˆλ‹€κ³  λ‹€ μ‹€μ œ μ €μž₯μ†Œμ— μ €μž₯λ˜λŠ” 것이 μ•„λ‹ˆλ‹€.)
- ### staging area(=index)
이 폴더 μ€‘μ—μ„œ λ‚΄κ°€ μ‹€μ œ μ €μž₯μ†Œμ— μ˜¬λ¦΄λ§Œν•œ 정보듀을 μ €μž₯ν•˜λŠ” μ˜μ—­μ΄λ‹€.
이 폴더 μ•ˆμ—μ„œ λ‚΄κ°€ μ‹€μ œ μ €μž₯μ†Œμ— μ˜¬λ¦΄λ§Œν•œ(쀀비쀑인) λ‚΄μš©λ“€μ΄ λͺ¨μ—¬μžˆλŠ” μ˜μ—­μ΄λ‹€.
이 μ˜μ—­μ— λ‚΄μš©μ„ μ˜¬λ¦¬λŠ” 것이 **staging(μŠ€ν…Œμ΄μ§•)** 이라고 ν•œλ‹€.
- ### repository
μ‹€μ œ 둜컬 μ €μž₯μ†Œ μ˜μ—­μ΄λ‹€.
μ‹€μ œ 둜컬 μ €μž₯μ†Œ μ˜μ—­μ΄λ‹€.


κ·Έλž˜μ„œ 둜컬 μ €μž₯μ†Œκ°€ μœ„μΉ˜ν•˜λŠ” λ‚΄ 폴더에 νŒŒμΌμ„ μˆ˜μ •ν•΄λ„ λ‹Ήμž₯은 μ‹€μ œ μ €μž₯μ†Œλž‘μ€ 상관이 μ—†λ‹€.
```add``` λͺ…λ Ήμ–΄λ‘œ 폴더(=working directory)μ•ˆμ—μ„œ μ €μž₯μ†Œμ— μ˜¬λ¦΄λ§Œν•œ 정보λ₯Ό 선택할 수 있으며,
```commit``` λͺ…λ Ήμ–΄λ‘œ μ €μž₯μ†Œμ— μ˜¬λ¦΄λ§Œν•œ 정보 μ˜μ—­(=μŠ€ν…Œμ΄μ§€, staging area)에 μžˆλŠ”κ±Έ μ‹€μ œ μ €μž₯μ†Œ(repository)에 μ˜¬λ¦°λ‹€.
- ```add``` λͺ…λ Ήμ–΄λ‘œ 폴더(=working directory)μ•ˆμ—μ„œ μ €μž₯μ†Œμ— μ˜¬λ¦΄λ§Œν•œ 정보λ₯Ό 선택할 수 있으며,
- ```commit``` λͺ…λ Ήμ–΄λ‘œ μ €μž₯μ†Œμ— μ˜¬λ¦΄λ§Œν•œ 정보 μ˜μ—­(=μŠ€ν…Œμ΄μ§€, staging area)에 μžˆλŠ”κ±Έ μ‹€μ œ μ €μž₯μ†Œ(repository)에 μ˜¬λ¦°λ‹€.

![image](https://user-images.githubusercontent.com/48408417/97103703-78876280-16f1-11eb-8d74-8dfbe57538b3.png)

## Reference
## 같이보면 쒋은 κ±°

- [μ½”λ“œμž‡ - Git의 3가지 μž‘μ—… μ˜μ—­](https://www.codeit.kr/learn/courses/version-control-with-git/2889)
- [Git의 Staging AreaλŠ” μ–΄λ–€ 점이 μœ μš©ν•œκ°€](https://blog.npcode.com/2012/10/23/git%EC%9D%98-staging-area%EB%8A%94-%EC%96%B4%EB%96%A4-%EC%A0%90%EC%9D%B4-%EC%9C%A0%EC%9A%A9%ED%95%9C%EA%B0%80/)

0 comments on commit ffa9945

Please sign in to comment.