GIT - Log & Diff

์†”๋น„ยท2024๋…„ 2์›” 5์ผ
gitstudy note
0

๐Ÿ—‚๏ธ GIT

๋ชฉ๋ก ๋ณด๊ธฐ
3/6

Git Graph ์„ค์น˜

vs code -> Extension -> git graph





new (file + branch)

  • Remote Repository ์ƒ์„ฑ (log_project)
๐Ÿ“Œ local์—๋„ ์ƒ์„ฑ
๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws (branch01)
$ git clone https://sxlbl:{ํ† ํฐ}@github.com/sxlbl/log_project.git
Cloning into 'log_project'...
remote: Enumerating objects: 3, done.
remote: Counting objects: 100% (3/3), done.
remote: Total 3 (delta 0), reused 0 (delta 0), pack-reused 0
Receiving objects: 100% (3/3), done.

๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws (branch01)
$ ls
HelloGit/  branch_project/  log_project/  test_project/

๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws (branch01)
$ cd log_project/
๐Ÿ“Œ cat๋ช…๋ น์–ด๋กœ ํŒŒ์ผ ์ƒ์„ฑ 
๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/log_project (main)
$ cat > hello.py
print('hello workd')

๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/log_project (main)
$ cat > hello.py
print('hello cat')

๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/log_project (main)
$ cat >> hello.py
print('hello world')

๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/log_project (main)
$ cat > hello.py
print('hello world')

๐Ÿงท
cat > | ํŒŒ์ผ์ƒ์„ฑ, ๋ถ™ํ˜€์“ฐ๊ธฐ
cat >> | ํŒŒ์ผ์ƒ์„ฑ, ์ถ”๊ฐ€๋กœ์“ฐ๊ธฐ



  • add, commit
๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/log_project (main)
$ git add hello.py

๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/log_project (main)
$ git commit -m 'modify 1' hello.py
[main ec659cb] modify 1
 1 file changed, 1 insertion(+)
 create mode 100644 hello.py

๐Ÿ’ข ๋งŒ๋‚ฌ๋˜ eroor ๋ชจ์Œ



  • log ํ™•์ธ
๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/log_project (main)
$ code .



-branch ์ƒ์„ฑ, ํŒŒ์ผ์ˆ˜์ • log ํ™•์ธ

๐Ÿ“Œ dev ๋ธŒ๋žœ์น˜ ์ƒ์„ฑ ๋ฐ ์ด๋™
๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/log_project (main)
$ git checkout -b dev
Switched to a new branch 'dev'

๐Ÿ“Œ ํ™•์ธ
๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/log_project (dev)
$ git branch
* dev
  main

๐Ÿ“Œ ํŒŒ์ผ์ˆ˜์ •
๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/log_project (dev)
$ cat > hello.py
print('hello, dog')

๐Ÿ“Œ commit
๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/log_project (dev)
$ git commit -m 'modify 2' hello.py
[dev 00be21d] modify 2
 1 file changed, 1 insertion(+), 1 deletion(-)





Git Log

branch๋ณ„ ๋ณ€๊ฒฝ์ด๋ ฅ์„ ๋ณผ ์ˆ˜ ์žˆ๋‹ค.

์œ„ ํŒŒ์ผ commit ์ •๋ฆฌ
1. main์—์„œ hello.py create(์—๋Ÿฌ๋กœ commit ๋‚ ๋ผ๊ฐ), modify1 ๊ฐ๊ฐ commit
2. dev์—์„œ hello.py ์ˆ˜์ • ํ›„ modify 2๋กœ commit

  • main์œผ๋กœ ์ด๋™
๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/log_project (dev)
$ git checkout main
Switched to branch 'main'
Your branch is ahead of 'origin/main' by 1 commit.
  (use "git push" to publish your local commits)
  • main branch log
$ git log
commit ec659cb349088e142047bbf1c99a304c8f7efb97 (HEAD -> main)
Author: sxlbl <sb.112097#gmail.com>
Date:   Mon Feb 5 14:27:48 2024 +0900

    modify 1

commit 0a4c4026487de63024b9fb7483e94014d0e9ab22 (origin/main, origin/HEAD)
Author: ๋ฐ•์†”๋น„ <154489441+sxlbl@users.noreply.github.com>
Date:   Mon Feb 5 13:38:59 2024 +0900

    Initial commit ๐Ÿ“Œ์ตœ์ดˆ์ƒ์„ฑํ–ˆ์„ ๋•Œ log
  • dev branch log
๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/log_project (dev)
$ git log
commit 00be21df43ff94664134d231c5f78ecaec5636b3 (HEAD -> dev)
Author: sxlbl <sb.112097#gmail.com>
Date:   Mon Feb 5 14:39:26 2024 +0900

    modify 2

commit ec659cb349088e142047bbf1c99a304c8f7efb97 (main)
Author: sxlbl <sb.112097#gmail.com>
Date:   Mon Feb 5 14:27:48 2024 +0900

    modify 1

commit 0a4c4026487de63024b9fb7483e94014d0e9ab22 (origin/main, origin/HEAD)
Author: ๋ฐ•์†”๋น„ <154489441+sxlbl@users.noreply.github.com>
Date:   Mon Feb 5 13:38:59 2024 +0900

    Initial commit





Git Editor ์„ค์ •

๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws (master)
$ git config --global core.editor "code --wait"

๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws (master)
$ git config --global core.editor
code --wait

๐Ÿ“ข wait์€ vs code ์‹คํ–‰ ์ค‘์— git bash๋ฅผ ๋Œ€๊ธฐ (์‚ฌ์šฉํ•˜์ง€ ์•Š๊ฒ ๋‹ค)๋Š” ์˜ต์…˜์ด๋ฏ€๋กœ ์ œ์™ธ์‹œ์ผœ๋„ ๊ดœ์ฐฎ์Œ





Git Diff Tool ์„ค์ •


-> vs์ฝ”๋“œ ์‹คํ–‰๋จ

[diff]
tool = vscode
[difftool "vscode"]
cmd = "code --wait --diff $LOCAL $REMOTE"

-> ์œ„ ์ฝ”๋“œ์ถ”๊ฐ€





Git Diff

๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws (master)
$ cd log_project/

๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/log_project (dev)
$ cat hello.py
print('hello, dog')

๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/log_project (dev)
$ git checkout main
Switched to branch 'main'
Your branch is ahead of 'origin/main' by 1 commit.
  (use "git push" to publish your local commits)

๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/log_project (main)
$ cat hello.py
print('hello, cat')

ํ˜„์žฌ ๋ฉ”์ธ branch์˜ ๊ฒฝ์šฐ hello.py ๋‚ด์šฉ์ด hello, cat
dev์˜ ๊ฒฝ์šฐ 'hello, dog'์œผ๋กœ ์„ธํŒ…๋˜์–ด์žˆ์Œ
์ฐจ์ด๋ฅผ ๋น„๊ตํ•ด์„œ ๋ณด๊ธฐ์œ„ํ•ด diff ๊ธฐ๋Šฅ ์‚ฌ์šฉํ• ๊ฒƒ.



๐Ÿงท branch ๊ฐ„ ๋น„๊ต
1. git diff <branch1><branch2>
2. git difftool <branch1><branch2>
-> vscode ์‹คํ–‰ ์—ฌ๋ถ€ y

  • 1๋ฒˆ๋ฐฉ๋ฒ•
๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/log_project (main)
$ git diff main dev
diff --git a/hello.py b/hello.py
index 0fd4867..96b5a66 100644
--- a/hello.py
+++ b/hello.py
@@ -1 +1 @@
-print('hello, cat')
+print('hello, dog')

โžก๏ธ git bash์— ์ถœ๋ ฅ

  • 2๋ฒˆ๋ฐฉ๋ฒ•
๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/log_project (main)
$ git difftool main dev

Viewing (1/1): 'hello.py'
Launch 'vscode' [Y/n]? y


โžก๏ธ vs code๋กœ ์ถœ๋ ฅ



๐Ÿงท Commit ๊ฐ„ ๋น„๊ต

  • git diff (or difftool) <commithash> <commithash>
  • commithash ํ™•์ธ
๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/log_project (main)
$ git log
commit ec659cb349088e142047bbf1c99a304c8f7efb97 (HEAD -> main)
Author: sxlbl <sb.112097#gmail.com>
Date:   Mon Feb 5 14:27:48 2024 +0900

    modify 1

commit 0a4c4026487de63024b9fb7483e94014d0e9ab22 (origin/main, origin/HEAD)
Author: ๋ฐ•์†”๋น„ <154489441+sxlbl@users.noreply.github.com>
Date:   Mon Feb 5 13:38:59 2024 +0900

    Initial commit
  • ๋น„๊ตํ™•์ธ
๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/log_project (main)
$ git diff ec659cb349088e142047bbf1c99a304c8f7efb97 0a4c4026487de63024b9fb7483e94014d0e9ab22
diff --git a/hello.py b/hello.py
deleted file mode 100644
index 0fd4867..0000000
--- a/hello.py
+++ /dev/null
@@ -1 +0,0 @@
-print('hello, cat')

๐Ÿ“Œ ์œ„ ์‹ค์Šต ์ค‘ create commit์ด ๋‚ ๋ผ๊ฐ€์„œ ๋น„๊ตํ•  ์ˆ˜๊ฐ€ ์—†์—ˆ์œผ๋‚˜, ์ผ๋‹จ ํ•˜๋Š”๋ฐฉ๋ฒ•๋งŒ ๊ธฐ๋กํ•˜๋„๋ก ํ•œ๋‹ค.



๐Ÿงท ๋งˆ์ง€๋ง‰ Commit ๊ณผ ์ด์ „ Commit ๋น„๊ต

  • git diff (or difftool) HEAD HEAD^
๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/log_project (main)
$ git checkout dev
Switched to branch 'dev'

๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/log_project (dev)
$ git diff HEAD HEAD^
diff --git a/hello.py b/hello.py
index 96b5a66..0fd4867 100644
--- a/hello.py
+++ b/hello.py
@@ -1 +1 @@
-print('hello, dog')
+print('hello, cat')



๐Ÿงท Git Diff - ๋งˆ์ง€๋ง‰ Commit ๊ณผ ํ˜„์žฌ ์ˆ˜์ •์‚ฌํ•ญ ํ™•์ธ

  • git diff (or difftool) HEAD
๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/log_project (dev)
$ git checkout main
Switched to branch 'main'
Your branch is ahead of 'origin/main' by 1 commit.
  (use "git push" to publish your local commits)

๐Ÿ“Œ ๋งˆ์ง€๋ง‰ commit ํ™•์ธ
๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/log_project (main)
$ cat hello.py
print('hello, cat')

๐Ÿ“Œ ํ˜„์žฌ์ˆ˜์ •์‚ฌํ•ญ
๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/log_project (main)
$ cat > hello.py
print('hello, pig')

๐Ÿ“Œ ํ™•์ธ
๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/log_project (main)
$ git diff HEAD
diff --git a/hello.py b/hello.py
index 0fd4867..fa518fa 100644
--- a/hello.py
+++ b/hello.py
@@ -1 +1 @@
-print('hello, cat')
+print('hello, pig')



๐Ÿงทlocal๊ณผ Remote ๊ฐ„์˜ ํ™•์ธ
git difftool main origin/main
origin : local
main : remote

๐Ÿ“Œ ํ˜„์žฌ commit๊นŒ์ง€ push
๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/log_project (main)
$ git push origin main
Enumerating objects: 4, done.
Counting objects: 100% (4/4), done.
Delta compression using up to 16 threads
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), 288 bytes | 288.00 KiB/s, done.
Total 3 (delta 0), reused 0 (delta 0), pack-reused 0
To https://github.com/sxlbl/log_project.git
   0a4c402..ec659cb  main -> main

๐Ÿ“Œ local์—์„œ ๋ณ€๊ฒฝ์‚ฌํ•ญ (pig) commit
๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/log_project (main)
$ git commit -m 'modify 3' hello.py
[main 1baa9d5] modify 3
 1 file changed, 1 insertion(+), 1 deletion(-)

โžก๏ธ ์—ฌ๊ธฐ์„œ remote์—๋Š” cat, local์—๋Š” pig ์ •๋ณด๋กœ commit๋˜์–ด์žˆ์Œ

๐Ÿ“Œ ํ™•์ธ
๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/log_project (main)
$ git diff origin/main
diff --git a/hello.py b/hello.py
index 0fd4867..fa518fa 100644
--- a/hello.py
+++ b/hello.py
@@ -1 +1 @@
-print('hello, cat')
+print('hello, pig')





์‹ค์Šต

  1. GitHub ์—์„œ Remote Repository ์ƒ์„ฑ
    โ€ข ์ด๋ฆ„ : diff_project
    โ€ข ์˜ต์…˜ : README.md


  1. Local ์— Clone
    โ€ข ์œ„์น˜ : git_ws ํด๋”
๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws (master)
$ git clone https://sxlbl:{ํ† ํฐ}@github.com/sxlbl/diff_project.git
Cloning into 'diff_project'...
remote: Enumerating objects: 3, done.
remote: Counting objects: 100% (3/3), done.
remote: Total 3 (delta 0), reused 0 (delta 0), pack-reused 0
Receiving objects: 100% (3/3), done.

๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws (master)
$ cd diff_project/

  1. Local Repository ์—์„œ ํŒŒ์ผ ์ƒ์„ฑ ํ›„ Push
    โ€ข text.txt
    โ€ข ํŒŒ์ผ ๋‚ด์šฉ : my name is noma
๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/diff_project (main)
$ cat text.txt
cat: text.txt: No such file or directory

๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/diff_project (main)
$ cat > text.txt
my name is nama

๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/diff_project (main)
$ ls
README.md  text.txt

๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/diff_project (main)
$ git status
On branch main
Your branch is up to date with 'origin/main'.

Untracked files:
  (use "git add <file>..." to include in what will be committed)
        text.txt

nothing added to commit but untracked files present (use "git add" to track)

๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/diff_project (main)
$ git add text.txt

๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/diff_project (main)
$ git status
On branch main
Your branch is up to date with 'origin/main'.

Changes to be committed:
  (use "git restore --staged <file>..." to unstage)
        new file:   text.txt


๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/diff_project (main)
$ git commit -m 'create text.txt' text.txt
[main c88c8d6] create text.txt
 1 file changed, 1 insertion(+)
 create mode 100644 text.txt

๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/diff_project (main)
$ git push origin main
Enumerating objects: 4, done.
Counting objects: 100% (4/4), done.
Delta compression using up to 16 threads
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), 285 bytes | 285.00 KiB/s, done.
Total 3 (delta 0), reused 0 (delta 0), pack-reused 0
To https://github.com/sxlbl/diff_project.git
   7aba2a4..c88c8d6  main -> main

  1. Main Branch ์—์„œ ํŒŒ์ผ ์ˆ˜์ • ํ›„ ๋งˆ์ง€๋ง‰ commit ํ•œ ๋‚ด์šฉ๊ณผ ๋น„๊ต
    โ€ข ํŒŒ์ผ ์ˆ˜์ • : my name is zero.
๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/diff_project (main)
$ cat > text.txt
my name is zero

๐Ÿ“Œ ๋งˆ์ง€๋ง‰ commit๊ณผ ํ˜„์žฌ ์ˆ˜์ •์‚ฌํ•ญ ํ™•์ธ 

๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/diff_project (main)
$ git diff HEAD
diff --git a/text.txt b/text.txt
index c69171b..bc63d8e 100644
--- a/text.txt
+++ b/text.txt
@@ -1 +1 @@
-my name is nama
+my name is zero

  1. Main Branch ์—์„œ ์ˆ˜์ •ํ•œ ๋‚ด์šฉ์„ commit ํ•œ ๋’ค Remote Server ์™€ ๋น„๊ต
๐Ÿ“Œ ์ˆ˜์ •๋‚ด์šฉ ํ™•์ธ

๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/diff_project (main)
$ cat text.txt
my name is zero

๐Ÿ“Œ commit
๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/diff_project (main)
$ git commit -m 'modify 1' text.txt
[main a06918b] modify 1
 1 file changed, 1 insertion(+), 1 deletion(-)

๐Ÿ“Œ remote <> local ๋น„๊ต
๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/diff_project (main)
$ git diff main origin/main
diff --git a/text.txt b/text.txt
index bc63d8e..c69171b 100644
--- a/text.txt
+++ b/text.txt
@@ -1 +1 @@
-my name is zero
+my name is nama

  1. Dev Branch ์ƒ์„ฑ ํ›„ ์ด๋™, ํŒŒ์ผ์„ ์ˆ˜์ •ํ•œ ๋’ค Master Branch ์™€ ๋น„๊ต
    โ€ข Branch ์ด๋ฆ„ : dev
    โ€ข ํŒŒ์ผ ์ˆ˜์ • : my name is base. (commit)

๐Ÿ“Œ dev ์ƒ์„ฑ ํ›„ ์ด๋™
๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/diff_project (main)
$ git checkout -b dev
Switched to a new branch 'dev'

๐Ÿ“Œ ๋งˆ์ง€๋ง‰ text.txt ๋‚ด์šฉ ํ™•์ธ
๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/diff_project (dev)
$ cat text.txt
my name is zero

๐Ÿ“Œ text.txt ๋‚ด์šฉ ์ˆ˜์ •
๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/diff_project (dev)
$ cat > text.txt
my name is base

๐Ÿ“Œ add & commit
๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/diff_project (dev)
$ git status
On branch dev
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        modified:   text.txt

no changes added to commit (use "git add" and/or "git commit -a")

๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/diff_project (dev)
$ git add text.txt

๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/diff_project (dev)
$ git status
On branch dev
Changes to be committed:
  (use "git restore --staged <file>..." to unstage)
        modified:   text.txt


๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/diff_project (dev)
$ git commit -m 'modify 2. base' text.txt
[dev ec6fc75] modify 2. base
 1 file changed, 1 insertion(+), 1 deletion(-)

๐Ÿ“Œ main ๊ณผ dev ๋น„๊ต
๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/diff_project (dev)
$ git diff main dev
diff --git a/text.txt b/text.txt
index bc63d8e..340176e 100644
--- a/text.txt
+++ b/text.txt
@@ -1 +1 @@
-my name is zero
+my name is base

  1. Dev Branch ์—์„œ ๋‘๋ฒˆ์งธ commit ๊ณผ ๋งˆ์ง€๋ง‰ commit ๋น„๊ต
    โ€ข ๋‘๋ฒˆ์งธ Commit Message : create test.txt
    โ€ข ๋งˆ์ง€๋ง‰ Commit Message : modify name - base
๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/diff_project (dev)
$ git log
๐Ÿ“Œ commit ec6fc755e1e062b90d28c0eb8c1ddbc60c986916 (HEAD -> dev)
Author: sxlbl <sb.112097#gmail.com>
Date:   Mon Feb 5 16:52:20 2024 +0900

    modify 2. base

commit a06918b74b313d48eaf4b75692465fbf725eb9f7 (main)
Author: sxlbl <sb.112097#gmail.com>
Date:   Mon Feb 5 16:48:00 2024 +0900

    modify 1

๐Ÿ“Œcommit c88c8d6b0845d0a45ae2bc5d5e33ff5196fb5155 (origin/main, origin/HEAD)
Author: sxlbl <sb.112097#gmail.com>
Date:   Mon Feb 5 16:40:41 2024 +0900

    create text.txt

commit 7aba2a4d9b57a29dab2b2bd97e62d2326b1bb99b
Author: ๋ฐ•์†”๋น„ <154489441+sxlbl@users.noreply.github.com>
Date:   Mon Feb 5 16:35:40 2024 +0900

    Initial commit

๐Ÿ“Œ commit ๊ฐ„ ๋น„๊ต 
๋ฐ•์†”๋น„@์†”๋น„์˜gram MINGW64 ~/OneDrive/Documents/git_ws/diff_project (dev)
$ git diff ec6fc755e1e062b90d28c0eb8c1ddbc60c986916 c88c8d6b0845d0a45ae2bc5d5e33ff5196fb5155
diff --git a/text.txt b/text.txt
index 340176e..c69171b 100644
--- a/text.txt
+++ b/text.txt
@@ -1 +1 @@
-my name is base
+my name is nama

  1. Git Grpah ํ™•์ธ
    โ€ข VSCode ์—์„œ diff_project ์˜ Git Graph ๋ฅผ Branch ๋ณ„๋กœ ํ™•์ธ

code.

Daily Study Note
profile
์†”๋น„
Study Log
์ด์ „ ํฌ์ŠคํŠธ

Git - Branch

๋‹ค์Œ ํฌ์ŠคํŠธ

Git - Merge & Conflict

0๊ฐœ์˜ ๋Œ“๊ธ€