๋ณธ๋ฌธ ๋ฐ”๋กœ๊ฐ€๊ธฐ
Git

[Git] Github ๋ช…๋ น์–ด ์ •๋ฆฌ

by soy๋ฏธ๋‹ˆ 2021. 10. 8.

 

 

 

๐Ÿฆ” Git ๋ช…๋ น์–ด

  • git init : git ์ƒ์„ฑํ•˜๊ธฐ
  • git clone git_path : github ํ”„๋กœ์ ํŠธ ๋ฐ›์•„ ์˜ค๊ธฐ
  • git branch branch_name : ๋ธŒ๋žœ์น˜ ์ƒ์„ฑํ•˜๊ธฐ
  • git branch -m branch_name : ๋ฉ”์ธ ๋ธŒ๋žœ์น˜ ์ƒ์„ฑํ•˜๊ธฐ(๊ทธ ์ „์— ์žˆ๋˜ main branch ๋Š” ์‚ญ์ œ๋œ๋‹ค.)
  • git checkout branch_name : ๋ธŒ๋žœ์น˜ ์„ ํƒํ•˜๊ธฐ
  • git checkout -t remote_path/branch_name : ์›๊ฒฉ ๋ธŒ๋žœ์น˜ ์„ ํƒํ•˜๊ธฐ
  • git branch -r : ์›๊ฒฉ ๋ธŒ๋žœ์น˜ ๋ชฉ๋ก๋ณด๊ธฐ
  • git branch -a : ๋กœ์ปฌ ๋ธŒ๋žœ์น˜ ๋ชฉ๋ก๋ณด๊ธฐ
  • git branch -m branch_name : ๋ธŒ๋žœ์น˜ ์ด๋ฆ„ ๋ฐ”๊พธ๊ธฐ
  • git branch -d branch_name : ๋ธŒ๋žœ์น˜ ์‚ญ์ œํ•˜๊ธฐ (ํ˜„์žฌ ์‚ฌ์šฉ์ค‘์ธ ๋ธŒ๋žœ์น˜๋Š” ๋‹ค๋ฅธ ๋ธŒ๋žœ์น˜๋กœ ์ด๋™ ํ›„ ์‚ญ์ œ)
  • git branch -D (or --delete --force) branch_name : merge ๋˜์ง€ ์•Š์€ ๋ธŒ๋žœ์น˜ ๊ฐ•์ œ๋กœ ์‚ญ์ œํ•˜๊ธฐ
  • git push remote_name --delete branch_name : ์›๊ฒฉ ๋ธŒ๋žœ์น˜ ์‚ญ์ œํ•˜๊ธฐ (ex. git push origin --delete new)
  • git add file_path : ์ˆ˜์ •ํ•œ ์ฝ”๋“œ ์„ ํƒํ•˜๊ธฐ (ex. git add . )
  • git commit -m โ€œcommentโ€ : ์„ ํƒํ•œ ์ฝ”๋“œ ์„ค๋ช… ์ ๊ธฐ (ex. git commit -m โ€œ๋‚ด์šฉโ€)
  • git push remote_name branch_name : add ํ•˜๊ณ  commit ํ•œ ์ฝ”๋“œ git server ์— ๋ณด๋‚ด๊ธฐ (ex. git push origin master)
  • git pull : github ์—์„œ ์ตœ์‹  ์ฝ”๋“œ ๋ฐ›์•„์™€ merge ํ•˜๊ธฐ
  • git fetch : github ์—์„œ ์ตœ์‹  ์ฝ”๋“œ ๋ฐ›์•„์˜ค๊ธฐ (๋ฐ›์•„์˜ค๊ณ  ๋ณ‘ํ•ฉ์€ ๋”ฐ๋กœ ํ•ด์•ผํ•œ๋‹ค.)
  • git reset --hard HEAD^ : commit ํ•œ ์ด์ „ ์ฝ”๋“œ ์ทจ์†Œํ•˜๊ธฐ
  • git reset --soft HEAD^ : ์ฝ”๋“œ๋Š” ์‚ด๋ฆฌ๊ณ  commit ๋งŒ ์ทจ์†Œํ•˜๊ธฐ
  • git reset --merge : merge ์ทจ์†Œํ•˜๊ธฐ
  • git reset --hard HEAD && git pull : git ์ฝ”๋“œ ๊ฐ•์ œ๋กœ ๋ชจ๋‘ ๋ฐ›์•„์˜ค๊ธฐ
  • --global : ์ปดํ“จํ„ฐ์˜ ๋ชจ๋“  ์ €์žฅ์†Œ์— ์ ์šฉ
  • git config --global user.name โ€œ๋‹‰๋„ค์ž„โ€ : github ๊ณ„์ • ์ด๋ฆ„ ์„ค์ •ํ•˜๊ธฐ
  • git config --global user.email โ€œ์ด๋ฉ”์ผ ์ฃผ์†Œโ€ : github ๊ณ„์ • ๋ฉ”์ผ ์„ค์ •ํ•˜๊ธฐ
  • --local : ์ž‘์—…์ค‘์ธ ํ˜„์žฌ ์ €์žฅ์†Œ์—๋งŒ ์ ์šฉ
  • git config --local user.name โ€œ๋‹‰๋„ค์ž„โ€ : github ๊ณ„์ • ์ด๋ฆ„ ์„ค์ •ํ•˜๊ธฐ
  • git config --local user.email โ€œ์ด๋ฉ”์ผ ์ฃผ์†Œโ€ : github ๊ณ„์ • ๋ฉ”์ผ ์„ค์ •ํ•˜๊ธฐ
  • git stash / git stash save โ€œdescriptionโ€ : ์ž‘์—…์ฝ”๋“œ ์ž„์‹œ์ €์žฅํ•˜๊ณ  ๋ธŒ๋žœ์น˜ ๋ฐ”๊พธ๊ธฐ
  • git stash pop : ๋งˆ์ง€๋ง‰์œผ๋กœ ์ž„์‹œ์ €์žฅํ•œ ์ž‘์—…์ฝ”๋“œ ๊ฐ€์ ธ์˜ค๊ธฐ
  • git branch --set-upstream-to=remote_path/branch_name : git pull no tracking info ์—๋Ÿฌ ํ•ด๊ฒฐ
  • git pull origin main --allow-unrelated-histories : fatal: refusing to merge unrelated histories (master ๋ธŒ๋žœ์น˜์—์„œ main ๋ธŒ๋žœ์น˜์— push ํ•˜๋ ค๋ฉด main ๋ธŒ๋žœ์น˜๋ฅผ pull ํ•œ ๋‹ค์Œ push ํ•ด์•ผ ํ•œ๋‹ค.)
  • git push origin master (ํ•˜๊ณ  github ์—์„œ pull request ํ•ด์•ผ ํ•œ๋‹ค.)

 

 

๐Ÿฆ” ๋ ˆํผ์ง€ํ† ๋ฆฌ ์ƒ์„ฑํ•˜๊ณ  bash ๋กœ ๊นƒ ์„ธํŒ…ํ•˜๊ธฐ

1. ๋กœ์ปฌ์— ํด๋” ์ƒ์„ฑํ•˜๊ธฐ

2. ํด๋” ์•ˆ์— ๋“ค์–ด๊ฐ€์„œ git bash ์—ด๊ธฐ

3. ๊นƒ ์ดˆ๊ธฐํ™”

git init

4. README ํŒŒ์ผ ์ƒ์„ฑํ•˜๊ธฐ

echo "# readme ์ƒ์„ฑ" >> README.md

5. ๊นƒ์— README ํŒŒ์ผ ์ถ”๊ฐ€ (๊ฒฝ๋กœ ์ง€์ •ํ•ด์•ผ ํ•  ๋•Œ๋Š” git add ./folder/hello.txt ๋กœ ์ง€์ •)

git add README.md

6. ๊นƒ ํ™•์ธ

git status

7. ๊นƒ์— ์ปค๋ฐ‹

git commit -m "first commit"

8. ๊นƒ main ๋ธŒ๋žœ์น˜ ์ƒ์„ฑ (์ดˆ๊ธฐ์—๋Š” master ๋ธŒ๋žœ์น˜, master ๋ธŒ๋žœ์น˜๋กœ ์ž‘์—…ํ•  ๊ฑฐ๋ฉด main ๋ธŒ๋žœ์น˜ ์ƒ์„ฑ ์•ˆํ•ด๋„ ๋จ.) 

git branch -M main

9. ๊นƒ ์›๊ฒฉ ์ €์žฅ์†Œ(remote)์— ๋ ˆํŒŒ์ง€ํ† ๋ฆฌ๋ฅผ origin ์œผ๋กœ add ํ•˜๊ธฐ

git remote add origin https://github.com/qwa310/newtest.git

10. ๊นƒ ์›๊ฒฉ ์ €์žฅ์†Œ ํ™•์ธํ•˜๊ธฐ

git remote -v

11. ๊นƒ main ๋ธŒ๋žœ์น˜์—์„œ ์ž‘์—…ํ•˜๋˜ ๊ฒƒ์„ ์›๊ฒฉ ์ €์žฅ์†Œ origin ์— ํ‘ธ์‹œ

git push -u origin main

 

 

 

๐Ÿฆ” Git์— ์ฝ”๋“œ PUSH ํ•  ๋•Œ ๋ช…๋ น์–ด ์‚ฌ์šฉ ์ˆœ์„œ

์ธ์ฆ ์˜ค๋ฅ˜ ๋ฐœ์ƒ ์‹œ

  • git config --global user.name โ€œ๋‹‰๋„ค์ž„โ€
  • git config --global user.email โ€œ์ด๋ฉ”์ผ ์ฃผ์†Œโ€
  • git init
  • git pull origin
  • git status
  • git add .
  • git commit -m "comment"
  • git remote add origin "repository url"
  • -> fatal: remote origin already exists ์—๋Ÿฌ ๋ฐœ์ƒ ์‹œ : git remote rm origin
  • git push -u origin master
  • -> ์—๋Ÿฌ ๋ฐœ์ƒ ์‹œ : git push -f origin master

 

 

'Git' ์นดํ…Œ๊ณ ๋ฆฌ์˜ ๋‹ค๋ฅธ ๊ธ€

git pull ํ•  ๋•Œ ์˜ค๋ฅ˜๋‚˜๋Š” ๊ฒฝ์šฐ git stash & git stash pop ์‚ฌ์šฉํ•˜๊ธฐ  (0) 2022.05.10

๋Œ“๊ธ€