Web Design Leaves

% git cat-file -p b1acd1b
tree 8759e1f7cb2183c13789eeccbe2e0d31ab65263a  // ツリーオブジェクトの識別子
parent 65955773eb9f32f979d0a7cfc32051d96766bf6c // 親の識別子
author foo <foo@example.com> 1691721109 +0900 //作成者の情報
committer foo <foo@example.com> 1691721109 +0900

extra text added to foo.txt  // コミットメッセージ

% mkdir my-project  // my-project というディレクトリを作成
% cd my-project     // my-project へ移動
% touch file1.txt   // 空のテキストファイル（file1.txt）を作成

% git clone https://github.com/schacon/simplegit-progit
Cloning into 'simplegit-progit'...
remote: Enumerating objects: 13, done.
remote: Total 13 (delta 0), reused 0 (delta 0), pack-reused 13
Receiving objects: 100% (13/13), done.
Resolving deltas: 100% (3/3), done.

% git clone https://github.com/schacon/simplegit-progit my-git-project

% git status
On branch master
Your branch is up to date with 'origin/master'.

nothing to commit, working tree clean

% git log
commit ca82a6dff817ec66f44342007202690a93763949 (HEAD -> master, origin/master, origin/HEAD)
Author: Scott Chacon <schacon@gmail.com>
Date:   Mon Mar 17 21:52:11 2008 -0700

    changed the verison number

commit 085bb3bcb608e1e8451d4b2432f8ecbe6306e7e7
Author: Scott Chacon <schacon@gmail.com>
Date:   Sat Mar 15 16:40:33 2008 -0700

    removed unnecessary test code

commit a11bef06a3f659402fe7563abf99ad00de2209e6
Author: Scott Chacon <schacon@gmail.com>
Date:   Sat Mar 15 10:31:28 2008 -0700

    first commit

//プロジェクトのルートディレクトリで以下のコマンドを実行します
rm -rf .git  // .git ディレクトリを削除

% echo Hello Git! > hello.txt

% git status
On branch main

No commits yet

Untracked files:
  (use "git add <file>..." to include in what will be committed)
        hello.txt  // 追跡されてないファイル

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

% git add hello.txt

% git status
On branch main

No commits yet

Changes to be committed: // 次回のコミットに含まれるファイル（ステージングエリアの内容）
  (use "git rm --cached <file>..." to unstage)
        new file:   hello.txt

% git commit

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# On branch main
#
# Initial commit
#
# Changes to be committed:
#       new file:   hello.txt
#
~
~  

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# On branch main
#
Initial commit
#
# Changes to be committed:
#       new file:   hello.txt
#
~
~
-- INSERT --  // インサートモード 

Initial commit
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# On branch main
#
# Initial commit
#
# Changes to be committed:
#       new file:   hello.txt
#
~
~
-- INSERT --  // インサートモード  

% git commit
[main (root-commit) 3f903a4]  Initial commit  // コミットメッセージ
 1 file changed, 1 insertion(+)
 create mode 100644 hello.txt

% git config --global core.editor "code --wait"

% git commit -m "Initial commit"

% git status
On branch main
nothing to commit, working tree clean  

% git log
commit 3f903a46cdb83d13bbb1d843029f11ee5f67e589 (HEAD -> main)
Author: foo <foo@example.com>
Date:   Tue Aug 1 15:33:49 2023 +0900

     Initial commit

% git status
On branch main
nothing to commit, working tree clean

% echo additional text >> hello.txt   //テキストを追加
% cat hello.txt  //テキストファイルの内容を表示
Hello Git!
additional text  // 追加されたテキスト

% git status
On branch main
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:   hello.txt  // 変更が検知されたファイル

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

% git add hello.txt  //ファイルをステージングエリアに追加

% git status
On branch main
Changes to be committed:
  (use "git restore --staged <file>..." to unstage)
        modified:   hello.txt

% git commit -m "text added"
[main 5cac768] text added
 1 file changed, 1 insertion(+)

% git status
On branch main
nothing to commit, working tree clean

% git log
commit 5cac768fa17a08989926ee972240b044277b7224 (HEAD -> main)
Author: foo <foo@example.com>
Date:   Thu Aug 1 15:43:04 2023 +0900

    text added  //コミットメッセージ

commit 3f903a46cdb83d13bbb1d843029f11ee5f67e589
Author: foo <foo@example.com>
Date:   Tue Aug 1 15:33:49 2023 +0900

     Initial commit  //コミットメッセージ

% echo Goodbye! >> hello.txt // ファイルを変更

% git commit -m "goodbye added"  // ステージせずにコミットしようとしてもできない
On branch main
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:   hello.txt

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

% git commit -a -m "goodbye added"  // -a オプションを指定してステージングエリアをスキップ
[main 9bc0d5f] goodbye added
 1 file changed, 1 insertion(+)

% git commit -am "goodbye added"  // -a -m をまとめて指定

% git status
On branch main
Untracked files:
  (use "git add <file>..." to include in what will be committed)
        password.txt

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

% echo password.txt > .gitignore  // .gitignore を作成して password.txt を記述

% cat .gitignore  // .gitignore の内容を表示
password.txt

% git status
On branch main
Untracked files:
  (use "git add <file>..." to include in what will be committed)
        .gitignore

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

% git add .gitignore // .gitignore をステージングエリアに追加
% git commit -m "adds .gitignore" // .gitignore をコミット

% git status
On branch main
nothing to commit, working tree clean

% git rm --cached sample.txt
rm 'sample.txt'

% git commit -m "sample.txt removed from index"
[main e5ce14f] sample.txt removed from index
 1 file changed, 1 deletion(-)
 delete mode 100644 sample.txt

% echo sample.txt >> .gitignore  // .gitignore に追加（更新）

% git commit -am "add sample.txt to .gitignore"  // -a オプションでステージングを省略
[main 712f243] add sample.txt to .gitignore
 1 file changed, 1 insertion(+)

% echo this is foo > foo.txt  // foo.txt を作成

% git add foo.txt // foo.txt をステージエリアに追加

% git commit -m "foo.txt added" // foo.txt をコミット
[main 726c5e3] foo.txt added
 1 file changed, 1 insertion(+)
 create mode 100644 foo.txt

% git status // ステータスはクリーン
On branch main
nothing to commit, working tree clean

% rm foo.txt // foo.txt を削除

% git status // ステータスを確認
On branch main
Changes not staged for commit:
  (use "git add/rm <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        deleted:    foo.txt

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

% git add foo.txt // foo.txt をステージエリアに追加

% git status
On branch main
Changes to be committed:
  (use "git restore --staged <file>..." to unstage)
        deleted:    foo.txt

% git commit -m "foo.txt removed"  //コミットを実行
[main f6d6e9e] foo.txt removed
 1 file changed, 1 deletion(-)
 delete mode 100644 foo.txt

% git status
On branch main
nothing to commit, working tree clean

% touch bar.txt
% git add bar.txt
% git commit -m "bar.txt added"
[main 7990699] bar.txt added
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 bar.txt
% git status
On branch main
nothing to commit, working tree clean

% git rm bar.txt  // git rm コマンドで bar.txt を削除
rm 'bar.txt' // rm コマンドで削除される

% git status  // ステータスを確認すると、bar.txt がステージされている
On branch main
Changes to be committed:
  (use "git restore --staged <file>..." to unstage)
        deleted:    bar.txt

% git commit -m "bar.txt removed"  // コミットを実行
[main 4ec7b2f] bar.txt removed
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 bar.txt

% git status
On branch main
nothing to commit, working tree clean

% touch baz.txt  // baz.txt を作成
% git add baz.txt  // baz.txt をステージ
% git commit -m "baz.txt added"  // コミット
[main fa2bf0f] baz.txt added
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 baz.txt
% git status  // ステータスを確認
On branch main
nothing to commit, working tree clean

% git rm --cached baz.txt  // --cached オプションを指定して削除
rm 'baz.txt'  // 削除と表示されるがプロジェクトには残る

% git status  // ステータスを確認
On branch main
Changes to be committed:
  (use "git restore --staged <file>..." to unstage)
        deleted:    baz.txt

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

% git commit -m "bax.txt removed from stage"  // コミットを実行
[main 84e9692] bax.txt removed from stage
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 baz.txt

% git status  // ステータスを確認
On branch main
Untracked files:
  (use "git add <file>..." to include in what will be committed)
        baz.txt

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

% echo baz.txt >> .gitignore   // .gitignore に baz.txt を追加

% cat .gitignore   // .gitignore の内容を確認
password.txt
baz.txt

% git status
On branch main
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:   .gitignore

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

% git add .gitignore  //.gitignore をステージエリアに追加

% git commit -m ".gitignore updated with baz.txt"   //.gitignore をコミット
[main 871916f] .gitignore updated with baz.txt
 1 file changed, 1 insertion(+)

% git status  // ステータスを確認（baz.txt は管理対象外となったので表示されない）
On branch main
nothing to commit, working tree clean

% touch file.txt  // file.txt を作成
% git add file.txt  // file.txt をステージ
% git commit -m "file.txt added"  // file.txt をコミット
[main d745d03] file.txt added
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 file.txt

% echo text for file.txt >> file.txt  // file.txt を変更
% git add file.txt  // file.txt をステージ
% git commit -m "add text to file.txt"  // file.txt をコミット
[main aa8d937] add text to file.txt
 1 file changed, 1 insertion(+)

% mkdir foo  // ディレクトリ foo を作成

% git status  // ステータスを確認
On branch main
nothing to commit, working tree clean

% mv file.txt foo  // シェルの mv コマンドで file.txt を移動

% git status
On branch main
Changes not staged for commit:
  (use "git add/rm <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        deleted:    file.txt

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

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

% git rm file.txt
rm 'file.txt'

% git status
On branch main
Changes to be committed:
  (use "git restore --staged <file>..." to unstage)
        deleted:    file.txt

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

% git add foo/file.txt

% git status
On branch main
Changes to be committed:
  (use "git restore --staged <file>..." to unstage)
        renamed:    file.txt -> foo/file.txt

% git commit -m "file.txt move to foo"
[main 0833233] file.txt move to foo
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename file.txt => foo/file.txt (100%)

% git status
On branch main
nothing to commit, working tree clean

% git mv file.txt foo // git mv コマンドを使って移動

% git status // ファイルは移動され、ステージもされている
On branch main
Changes to be committed:
  (use "git restore --staged <file>..." to unstage)
        renamed:    file.txt -> foo/file.txt

% git commit -m "move file.txt to foo"  // コミット
[main 8c2967f] move file.txt to foo
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename file.txt => foo/file.txt (100%)

% git status
On branch main
nothing to commit, working tree clean

% git log -p
commit bbeb4bd32946b90a5fab7f1db8f0c029fb632916 (HEAD -> main)
Author: foo <foo@example.com>
Date:   Thu Aug 3 16:02:52 2023 +0900

    overwrite

diff --git a/hello.txt b/hello.txt  // 差分（変更点）
index d6eb0c5..48abe86 100644
--- a/hello.txt
+++ b/hello.txt
@@ -1,4 +1 @@
-Hello Git!  // 行の削除
-additional text  // 行の削除
-additional text2  // 行の削除
-some more text  // 行の削除
+Hello Again!  // 行の追加

commit c017211c81c71b4d57b95a3d8c28e348d7957631
Author: foo <foo@example.com>
Date:   Thu Aug 3 15:17:57 2023 +0900

    3rd commit

diff --git a/hello.txt b/hello.txt  // 差分（変更点）
index 525c197..d6eb0c5 100644
--- a/hello.txt
+++ b/hello.txt
@@ -1,2 +1,4 @@
 Hello Git!
 additional text
+additional text2  // 行の追加
+some more text  // 行の追加

・・・以下省略・・・

% git log --oneline
8c2967f (HEAD -> main) move file.txt to foo
edf49a8 move back file.txt
0833233 file.txt move to foo
aa8d937 add text to file.txt
d745d03 file.txt added
e5aee37 file.txt removed
47ac2ad file.txt added
871916f .gitignore updated with baz.txt
84e9692 bax.txt removed from stage
00a7b39 baz.txt added
4ec7b2f bar.txt removed
7990699 bar.txt added
f6d6e9e foo.txt removed
726c5e3 foo.txt added
0012513 .itignore updated
5b171d5 adds .gitignore
9bc0d5f goodbye added
bbeb4bd overwrite
c017211 3rd commit
5cac768 text added
3f903a4  Initial commit

% git log --pretty=oneline
8c2967fef3616cd79aa5bb55fbeabc427546eb48 (HEAD -> main) move file.txt to foo
edf49a8931cd9975853b38a571e9c7484e1fd41b move back file.txt
0833233eaed2da42000f054b383563fad435764e file.txt move to foo
aa8d937d7a9dc052fbc7a2570885cfa301cafd41 add text to file.txt
d745d03782842cfba63221e18482e747fe1967fc file.txt added
e5aee37b0772d18a35b5189266b55fd9c7ac4947 file.txt removed
47ac2ad11b9f904177293aadeaf8cc7e9f27546e file.txt added
871916f233dd6cb0038ac72ad1a81ad755b73794 .gitignore updated with baz.txt
・・・

% git log --pretty=format:"%h - %an, %ar : %s"
8c2967f - foo, 3 hours ago : move file.txt to foo
edf49a8 - foo, 3 hours ago : move back file.txt
0833233 - foo, 5 hours ago : file.txt move to foo
aa8d937 - foo, 5 hours ago : add text to file.txt
d745d03 - foo, 5 hours ago : file.txt added
e5aee37 - foo, 5 hours ago : file.txt removed
47ac2ad - foo, 5 hours ago : file.txt added
871916f - foo, 6 hours ago : .gitignore updated with baz.txt
・・・

% git log --oneline -3
8c2967f (HEAD -> main) move file.txt to foo
edf49a8 move back file.txt
0833233 file.txt move to foo

% git log --pretty="%h - %s" --grep=foo
8c2967f - move file.txt to foo
0833233 - file.txt move to foo
f6d6e9e - foo.txt removed
726c5e3 - foo.txt added

git log path/to/your/file

% git log --oneline hello.txt
9bc0d5f goodbye added
bbeb4bd overwrite
c017211 3rd commit
5cac768 text added
3f903a4  Initial commit

git diff commit_hash1 commit_hash2 path/to/your/file

% git diff 5cac768 c017211 hello.txt
diff --git a/hello.txt b/hello.txt
index 525c197..d6eb0c5 100644
--- a/hello.txt
+++ b/hello.txt
@@ -1,2 +1,4 @@
 Hello Git!
 additional text
+additional text2
+some more text

% echo Hello! >> file1.txt

% git add file1.txt

% git commit -m "test added"
[main 04ea458] test added
 1 file changed, 1 insertion(+)

% git log --oneline file1.txt
04ea458 (HEAD -> main) test added  //コミットメッセージを間違えた
a1d4863 initial commit  

% git commit --amend -m "text added"
[main 7ac06cc] text added
 Date: Sat Aug 5 15:01:25 2023 +0900
 1 file changed, 1 insertion(+)

 % git log --oneline file1.txt
7ac06cc (HEAD -> main) text added  //コミットメッセージが修正された（ハッシュ値が変わる）
a1d4863 initial commit

% git commit -m "udate file1" // file2.txt をステージするのを忘れてコミット
[main e0c30a7] udate file1
 1 file changed, 1 insertion(+)

% git log --oneline
e0c30a7 (HEAD -> main) udate file1
7ac06cc text added
a1d4863 initial commit

% git add file2.txt  // file2.txt をステージ

% git commit --amend -m "update file1 and added file2" // git commit --amend
[main b50b841] update file1 and added file2
 Date: Sat Aug 5 15:19:49 2023 +0900
 2 files changed, 2 insertions(+)
 create mode 100644 file2.txt

% git log --oneline
b50b841 (HEAD -> main) update file1 and added file2
7ac06cc text added
a1d4863 initial commit

% git add file2.txt  //ファイルを変更後ステージングする

% git status //ステータスを確認
On branch main
Changes to be committed:
  (use "git restore --staged <file>..." to unstage)
        modified:   file2.txt

% git restore --staged file2.txt //ステージングの取り消し

% git status
On branch main
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:   file2.txt

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

% git diff file2.txt
diff --git a/file2.txt b/file2.txt
index 009cf80..ceed7ef 100644
--- a/file2.txt
+++ b/file2.txt
@@ -1 +1,2 @@
 this is file2
+some additional text

% cat file2.txt // ワーキングツリーのファイルの内容を表示
this is file2
some additional text

% git status
On branch main
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:   file2.txt

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

% git restore file2.txt

% git diff file2.txt // 差分なし

% cat file2.txt
this is file2  // 変更は削除されている