Log & Diff
๊ธฐ๋กํ์ธ(log)
log๋ ์ญ์ฌ๋ผ ์๊ฐํ๋ฉด ๋๋ค. commit
ํ๋ ๋ฒ์ ๋ค์ ๊ธฐ๋ก์ ํ์ธ ํ ์ ์๋ค.
$ git log
commit c6ce442fa11b976aa717eeacd4dc05a501bfdda5
Author: dahye Jeong <wjdekgp1750@naver.com>
Date: Thu Mar 23 17:28:55 2017 +0900
first commit
์ฒซ ์ปค๋ฐ์!!
commit ๋ค์ ๋ฌธ์(c6ce442fa11b976aa717eeacd4dc05a501bfdda5)๋ ์ด ๋ฒ์ ์ ๋ํ ์๋ณ์(hashcode)์ด๋ค.
$ git log -p
commit c6ce442fa11b976aa717eeacd4dc05a501bfdda5
Author: dahye Jeong <wjdekgp1750@naver.com>
Date: Thu Mar 23 17:28:55 2017 +0900
first commit
์ฒซ ์ปค๋ฐ์!!
diff --git a/test1.html b/test1.html
new file mode 100644
index 0000000..58d93db
--- /dev/null
+++ b/test1.html
@@ -0,0 +1 @@
+<p>test</p>
์ด๋ ํ ์ฝ๋๊ฐ ๋ฐ๊ผ๋์ง ์ ์ ์๋ค.
๋น๊ต(diff)
Unstage(uncommit)๋ ์์ ์ฌํญ ํ์ธ
$ git diff
commit(stage)๋ ์์ ์ฌํญ ํ์ธ
$ git diff --cached
$ git diff --staged
๋ธ๋์น๊ฐ ๋น๊ต
$ git diff [๋ธ๋์น1] [๋ธ๋์น2]
git diff master practice
diff --git a/aa.txt b/aa.txt
index ec18514..4374318 100644
--- a/aa.txt
+++ b/aa.txt
@@ -1,5 +1,3 @@
first commit
-log,diff๋น๊ตํด๋ณด์!!
-
-master๋ธ๋์น์ผ
\ No newline at end of file
+log,diff๋น๊ตํด๋ณด์!!
\ No newline at end of file
commit๊ฐ ๋น๊ต
$ git diff <commit hash> <commit hash>
$ git diff 59f62dfcb5742b3712f4e2a20c7e2b41e995fef9 cbba34b0b53696b22e8bf24894755431eaf2f525
diff --git a/aa.txt b/aa.txt
index ec18514..4374318 100644
--- a/aa.txt
+++ b/aa.txt
@@ -1,5 +1,3 @@
first commit
-log,diff๋น๊ตํด๋ณด์!!
-
-master๋ธ๋์น์ผ
\ No newline at end of file
+log,diff๋น๊ตํด๋ณด์!!
๋ง์ง๋ง commit ๊ณผ ๊ทธ ์ commit ๋น๊ต
$ git diff HEAD HEAD^
๋ฌ๋ผ์ง ๋ถ๋ถ์ ์๋ ค์ค๋ค.
Last updated
Was this helpful?