๐์ฃผ์ ์ฌํญ๐
git push origin master ํ์ง ๋ง๊ฒ !!!
- git clone https://github.com/nate1994/algorithm.git
- git branch '์์ ์ ์์ด์ด๋์ 3๊ธ์' ex) LSJ
- git checkout '์์ ์ branch๋ช '
- ์์ ์ ์ด๋์ ์ ๋ง๋ ํด๋์์๋ง ์์ฑ
- git add '์์ ์ ํด๋๋ช '
- git commit -m '์ปค๋ฐ'
git remote add portfolio(origin๋ง ๋นผ๊ณ ์๋ฌด๊ฑฐ๋) 'git์ฃผ์' (๊ฐ์ธ ์๋์ฌ๊ธฐ + ํฌํธํด๋ฆฌ์ค ์ฃผ์๋ก ์ฐ๊ฒฐํด์ฃผ์ธ์)- git push origin '์์ ์ branch๋ช ' (๐ **์ ๋ master ํ๋ฉด ์๋ฉ๋๋ค.... **)
git push portfolio master- git remote add portfolio(origin๋ง ๋นผ๊ณ ์๋ฌด๊ฑฐ๋) 'git์ฃผ์' (๊ฐ์ธ ์๋์ฌ๊ธฐ + ํฌํธํด๋ฆฌ์ค ์ฃผ์๋ก ์ฐ๊ฒฐํด์ฃผ์ธ์) -> git push portfolio '๋ธ๋์น๋ช '
โ ๋๋ ๊ฐ์ ๊ฐ์ธ์ด ๊ด๋ฆฌํ๋ TIL ๋ ํ์งํ ๋ฆฌ์ ๋ถ์ฌ๋ฃ์ด์ ํธ์ฌํด์ฃผ์ธ์....
๋ฐ์ ์๋ ๊ฒ๋ค์ gitํ๋ฉด์ ํ์ํ ๋ช ๋ น์ด๋ branch ๊ฐ๋ ์ ์กฐ๊ธ์ด๋๋ง ์ค๋ช ํ๊ธฐ ์ํด์ ์์ฑ ํด๋ดค์ต๋๋ค.
+)git ๋ช ๋ น์ด
[https://velog.io/@hidaehyunlee/Git-add-commit-push-%EC%B7%A8%EC%86%8C%ED%95%98%EA%B8%B0
-
๋ธ๋์น์ ๋ชฉ๋ก์ ๋ณผ ๋
git branch
-
๋ธ๋์น๋ฅผ ์์ฑํ ๋
git branch "์๋ก์ด ๋ธ๋์น ์ด๋ฆ"
-
๋ธ๋์น๋ฅผ ์ญ์ ํ ๋
git branch -d
-
๋ณํฉํ์ง ์์ ๋ธ๋์น๋ฅผ ๊ฐ์ ์ญ์ ํ ๋
git branch -D
-
๋ธ๋์น๋ฅผ ์ ํ(์ฒดํฌ์์)ํ ๋
git checkout "์ ํํ๋ ค๋ ๋ธ๋์น ์ด๋ฆ"
-
๋ธ๋์น๋ฅผ ์์ฑํ๊ณ ์ ํ๊น์ง ํ ๋
git checkout -b "์์ฑํ๊ณ ์ ํํ ๋ธ๋์น ์ด๋ฆ"
- git init (master)
- a.txt ์์ฑ -> 1 ์์ฑ
- git add a.txt-> git commit : master ๋ฒ์ ์์๋ 1์ด ๊ธฐ๋ก๋๋ค.
- git branch exp (master)
- git branch๋ก ๊ฒฐ๊ณผ๋ฅผ ํ์ธ
- git checkout exp (exp)
- exp ๋ผ๋ ๋ธ๋์น๋ก ์ ํ
- a.txt - > 2๋ฅผ ์ถ๊ฐ๋ก ์์
- git add a.txt -> git commit
- exp ๋ฒ์ ์์๋ 1,2 ๊ฐ ์ ํ์๋ ๊ฒ์ผ๋ก ๊ธฐ๋ก
- git checkout master (master)
- master๋ฒ์ ์ผ๋ก ๋ค์ ๊ด๋ฆฌ ํ๋ฉด์ a.txt ํ์ผ์ ๋ณด๋ฉด 1๋ง ๋จ์์๋ ๊ฒ์ ํ์ธ๊ฐ๋ฅํ๋ค.
-
๋ธ๋์น ๊ฐ์ ๋น๊ตํ ๋
โ - git log "๋น๊ตํ ๋ธ๋์น ๋ช 1".."๋น๊ตํ ๋ธ๋์น ๋ช 2"
-
๋ธ๋์น ๊ฐ์ ์ฝ๋๋ฅผ ๋น๊ต ํ ๋
โ - git diff "๋น๊ตํ ๋ธ๋์น ๋ช 1".."๋น๊ตํ ๋ธ๋์น ๋ช 2"
-
๋ก๊ทธ์ ๋ชจ๋ ๋ธ๋์น๋ฅผ ํ์ํ๊ณ , ๊ทธ๋ํ๋ก ํํํ๊ณ , ๋ธ๋์น ๋ช ์ ํ์ํ๊ณ , ํ์ค๋ก ํ์ํ ๋
โ - git log --branches --graph --decorate --oneline
d@DESKTOP-R6TL6SN MINGW64 ~/Desktop/gitbranch (master)
$ git log --branches --graph --decorate --oneline
* fee33e0 (b) 1 2 3
| * 2cfaf46 (a) 1 2
|/ # ์๋ฏธ : log 1์ ๋ถ๊ธฐ์ ์ผ๋ก (a)์ (b)๋ก ๋๋์ด์ก๋ค๋ ๊ฒ์ ํ์ธ๊ฐ๋ฅ
* 9015003 (HEAD -> master) 1
$ git log master..a
commit 2cfaf46f9c31b1933c4415990cd9da6725f599cb (a)
Author: nate1994 <nate199458@gmail.com>
Date: Wed Aug 19 06:32:59 2020 +0900
1 2
# a์๋ ์๊ณ master์๋ ์๋ ๊ฒ์ ์๋ ค์ค
# ๋ฐ๋๋ก ์ ์ฉ ๊ฐ๋ฅ
$ git log a..master
# master์๋ ์๊ณ a์๋ ์๋ ๊ฒ์ ์๋ ค์ค
A ๋ธ๋์น๋ก B ๋ธ๋์น๋ฅผ ๋ณํฉํ ๋ (A โ B)
โ git checkout A โ git merge B
ex) a ์ ๋ด์ฉ์ master์ ๋ณํฉํ๊ธฐ
d@DESKTOP-R6TL6SN MINGW64 ~/Desktop/gitbranch (master)
$ git merge a
Updating 9015003..2cfaf46
Fast-forward
git.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
d@DESKTOP-R6TL6SN MINGW64 ~/Desktop/gitbranch (master)
$ git log
commit 2cfaf46f9c31b1933c4415990cd9da6725f599cb (HEAD -> master, a)
Author: nate1994 <nate199458@gmail.com>
Date: Wed Aug 19 06:32:59 2020 +0900
1 2
commit 9015003ad68071162c971f2fe6eaf425e152df20
Author: nate1994 <nate199458@gmail.com>
Date: Wed Aug 19 06:32:09 2020 +0900
1
๊ฐ์ ํ์ผ์ ๊ฐ์ ๋ถ๋ถ์ ๋ค๋ฅด๊ฒ ์์ ํ์ ๋,
-> CONFLICT ๋ฌธ๊ตฌ๋ฅผ ํ์ธ ๊ฐ๋ฅํ๋ค
-> git status
๋ฅผ ํตํด ์ด๋ค ํ์ผ์ด ๋ฌธ์ ์ธ์ง ํ์ธ์ด ๊ฐ๋ฅ
- ํด๊ฒฐ
- ์ถฉ๋๋ ๋ถ๋ถ์ ์์
https://gmlwjd9405.github.io/2018/05/18/git-stash.html
์ค๋ช ์ด ์๋์ด์๊ธฐ ๋๋ฌธ์ ์ด๊ฒ์ ๋ณด๊ณ ์ฌ์ฉํ ๊ฒ
push ์์
d@DESKTOP-R6TL6SN MINGW64 ~/Desktop/gitbranch
$ git init
Initialized empty Git repository in C:/Users/d/Desktop/gitbranch/.git/
d@DESKTOP-R6TL6SN MINGW64 ~/Desktop/gitbranch (master)
$ git remote add origin https://github.com/nate1994/branchpractice.git
d@DESKTOP-R6TL6SN MINGW64 ~/Desktop/gitbranch (master)
$ git add .
d@DESKTOP-R6TL6SN MINGW64 ~/Desktop/gitbranch (master)
$ git commit -m '1'
[master (root-commit) fc5cadd] 1
1 file changed, 1 insertion(+)
create mode 100644 a/b.txt
d@DESKTOP-R6TL6SN MINGW64 ~/Desktop/gitbranch (master)
$ git push origin master
Enumerating objects: 4, done.
Counting objects: 100% (4/4), done.
Writing objects: 100% (4/4), 235 bytes | 235.00 KiB/s, done.
Total 4 (delta 0), reused 0 (delta 0), pack-reused 0
To https://github.com/nate1994/branchpractice.git
* [new branch] master -> master
d@DESKTOP-R6TL6SN MINGW64 ~/Desktop/gitbranch (master)
$ git checkout -b a
Switched to a new branch 'a'
d@DESKTOP-R6TL6SN MINGW64 ~/Desktop/gitbranch (a)
$ git add .
d@DESKTOP-R6TL6SN MINGW64 ~/Desktop/gitbranch (a)
$ git commit -m '2'
[a 2c4cd9a] 2
1 file changed, 1 insertion(+)
create mode 100644 b/c.txt
d@DESKTOP-R6TL6SN MINGW64 ~/Desktop/gitbranch (a)
$ git log
commit 2c4cd9a58fff9f21d315f23e1c63ad75419859f4 (HEAD -> a)
Author: nate1994 <nate199458@gmail.com>
Date: Wed Aug 19 08:09:21 2020 +0900
2
commit fc5cadd1f5c3ea367bc68167430ab5d8d70b3f90 (origin/master, master)
Author: nate1994 <nate199458@gmail.com>
Date: Wed Aug 19 08:07:41 2020 +0900
1
d@DESKTOP-R6TL6SN MINGW64 ~/Desktop/gitbranch (a)
$ git push origin a
Enumerating objects: 5, done.
Counting objects: 100% (5/5), done.
Delta compression using up to 6 threads
Compressing objects: 100% (2/2), done.
Writing objects: 100% (4/4), 289 bytes | 289.00 KiB/s, done.
Total 4 (delta 0), reused 0 (delta 0), pack-reused 0
remote:
remote: Create a pull request for 'a' on GitHub by visiting:
remote: https://github.com/nate1994/branchpractice/pull/new/a
remote:
To https://github.com/nate1994/branchpractice.git
* [new branch] a -> a