Git + GitHub 学习笔记

git --version

$ git --version
git version 2.51.2.windows.1

cd ~/git-demo/yanxisishi-todo
git init
git status

$ cd ~/git-demo/yanxisishi-todo

$ git init
Initialized empty Git repository in ~/git-demo/yanxisishi-todo/.git/

$ git status
On branch master

No commits yet

Untracked files:
  (use "git add <file>..." to include in what will be committed)
	README.md
	index.html

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

git config --global user.name "yanxisishi"
git config --global user.email "yanxisishi@gmail.com"

$ git config --global user.name "yanxisishi"

$ git config --global user.email "yanxisishi@gmail.com"

git add index.html
git status
git commit -m "添加待办页面"
git log

$ git add index.html

$ git status
On branch master

No commits yet

Changes to be committed:
  (use "git rm --cached <file>..." to unstage)
	new file:   index.html

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

$ git commit -m "添加待办页面"
[master (root-commit) c380c36] 添加待办页面
 1 file changed, 58 insertions(+)
 create mode 100644 index.html

$ git log
commit c380c368fead5136eff3db9d67f73a58251d8bd9 (HEAD -> master)
Author: yanxisishi <yanxisishi@gmail.com>
Date:   Tue Oct 13 17:15:13 2026 +0800

    添加待办页面

git add README.md
git commit -m "添加项目说明"
git log

$ git add README.md

$ git commit -m "添加项目说明"
[master 833ad39] 添加项目说明
 1 file changed, 5 insertions(+)
 create mode 100644 README.md

$ git log
commit 833ad395129cecb15c479981eca649c3248b1d4b (HEAD -> master)
Author: yanxisishi <yanxisishi@gmail.com>
Date:   Tue Oct 13 17:15:16 2026 +0800

    添加项目说明

commit c380c368fead5136eff3db9d67f73a58251d8bd9
Author: yanxisishi <yanxisishi@gmail.com>
Date:   Tue Oct 13 17:15:13 2026 +0800

    添加待办页面

git status
git diff

$ git status
On branch master
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:   index.html

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

$ git diff
diff --git a/index.html b/index.html
index b8a5406..72cd078 100644
--- a/index.html
+++ b/index.html
@@ -5,8 +5,8 @@
 <title>yanxisishi 待办</title>
 <style>
 body {
-    background: #ffffff;
-    color: #222222;
+    background: #202020;
+    color: #eeeeee;
 }
 .completed .due-date { text-decoration: line-through; }
 .completed .task-text { text-decoration: line-through; }

git restore index.html
git status

$ git restore index.html

$ git status
On branch master
nothing to commit, working tree clean

git restore --staged index.html
git status

$ git restore --staged index.html

$ git status
On branch master
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:   index.html

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

git restore --staged .
git status

$ git restore --staged .

$ git status
On branch master
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:   index.html

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

git restore index.html
git status

$ git restore index.html

$ git status
On branch master
nothing to commit, working tree clean

git reset --hard HEAD~1
git status

$ git reset --hard HEAD~1
HEAD is now at 833ad39 添加项目说明

$ git status
On branch master
nothing to commit, working tree clean

git reset --mixed HEAD~1
git status

$ git reset --mixed HEAD~1
Unstaged changes after reset:
M	index.html

$ git status
On branch master
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:   index.html

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

git reset --soft HEAD~1
git status

$ git reset --soft HEAD~1

$ git status
On branch master
Changes to be committed:
  (use "git restore --staged <file>..." to unstage)
	modified:   index.html

git revert HEAD
git log --oneline

$ git revert HEAD
[master 042d150] Revert "添加深色主题"
 Date: Tue Oct 13 17:15:52 2026 +0800
 1 file changed, 2 insertions(+), 2 deletions(-)

$ git log --oneline
042d150 (HEAD -> master) Revert "添加深色主题"
af6433b 添加深色主题
833ad39 添加项目说明
c380c36 添加待办页面

notes.txt
.DS_Store

git add .gitignore
git commit -m "添加 .gitignore"
git status

$ git add .gitignore

$ git commit -m "添加 .gitignore"
[master 924fc03] 添加 .gitignore
 1 file changed, 2 insertions(+)
 create mode 100644 .gitignore

$ git status
On branch master
nothing to commit, working tree clean

git branch feature/due-date
git branch
git switch feature/due-date
git branch

$ git branch feature/due-date

$ git branch
  feature/due-date
* master

$ git switch feature/due-date
Switched to branch 'feature/due-date'

$ git branch
* feature/due-date
  master

git switch -c feature/due-date

$ git switch -c feature/due-date
Switched to a new branch 'feature/due-date'

git checkout -b feature/due-date

$ git checkout -b feature/due-date
Switched to a new branch 'feature/due-date'

git log --oneline

$ git log --oneline
d9b8f28 (HEAD -> feature/due-date) 添加过期提醒
061b6d3 保存截止日期
8c63d15 添加截止日期输入
924fc03 (master) 添加 .gitignore
042d150 Revert "添加深色主题"
af6433b 添加深色主题
833ad39 添加项目说明
c380c36 添加待办页面

git switch master

$ git switch master
Switched to branch 'master'

git switch master
git merge feature/due-date
git log --oneline

$ git switch master
Already on 'master'

$ git merge feature/due-date
Updating 924fc03..d9b8f28
Fast-forward
 index.html | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

$ git log --oneline
d9b8f28 (HEAD -> master, feature/due-date) 添加过期提醒
061b6d3 保存截止日期
8c63d15 添加截止日期输入
924fc03 添加 .gitignore
042d150 Revert "添加深色主题"
af6433b 添加深色主题
833ad39 添加项目说明
c380c36 添加待办页面

git branch -d feature/due-date

$ git branch -d feature/due-date
Deleted branch feature/due-date (was d9b8f28).

git switch master
git merge feature/sort
git merge feature/complete-all
git status

$ git switch master
Switched to branch 'master'

$ git merge feature/sort
Updating d9b8f28..81ec281
Fast-forward
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

$ git merge feature/complete-all
Auto-merging index.html
CONFLICT (content): Merge conflict in index.html
Automatic merge failed; fix conflicts and then commit the result.

$ git status
On branch master
You have unmerged paths.
  (fix conflicts and run "git commit")
  (use "git merge --abort" to abort the merge)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   index.html

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

<<<<<<< HEAD
当前分支中的排序按钮代码
=======
待合入分支中的全部完成按钮代码
>>>>>>> feature/complete-all

git add index.html
git commit
git status

$ git add index.html

$ git commit
[master 79cee29] Merge branch 'feature/complete-all'

$ git status
On branch master
nothing to commit, working tree clean

git switch feature/complete-all
git rebase master

$ git switch feature/complete-all
Switched to branch 'feature/complete-all'

$ git rebase master
Auto-merging index.html
CONFLICT (content): Merge conflict in index.html
Rebasing (1/1)
error: could not apply 6ad871b... 添加全部完成按钮和逻辑
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Could not apply 6ad871b... # 添加全部完成按钮和逻辑

git add index.html
git rebase --continue
git status

$ git add index.html

$ git rebase --continue
[detached HEAD c939f76] 添加全部完成按钮和逻辑
 1 file changed, 3 insertions(+), 1 deletion(-)
Successfully rebased and updated refs/heads/feature/complete-all.

$ git status
On branch feature/complete-all
nothing to commit, working tree clean

git switch master
git merge feature/complete-all

$ git switch master
Switched to branch 'master'

$ git merge feature/complete-all
Updating 81ec281..c939f76
Fast-forward
 index.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

git stash
git status

$ git stash
Saved working directory and index state WIP on feature/clear-completed: 50287b5 添加清空已完成按钮

$ git status
On branch feature/clear-completed
nothing to commit, working tree clean

git switch feature/clear-completed
git stash pop

$ git switch feature/clear-completed
Switched to branch 'feature/clear-completed'

$ git stash pop
On branch feature/clear-completed
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:   index.html

no changes added to commit (use "git add" and/or "git commit -a")
Dropped refs/stash@{0} (e4798bff72200c62548f80e2f6030d15aefdf8eb)

git worktree add -b feature/stats "../yanxisishi-todo-stats" master

$ git worktree add -b feature/stats "../yanxisishi-todo-stats" master
Preparing worktree (new branch 'feature/stats')
HEAD is now at 58d0f01 Merge branch 'feature/clear-completed'

git worktree list
cd "../yanxisishi-todo-stats"
git branch

$ git worktree list
~/git-demo/yanxisishi-todo        ead87c5 [feature/export]
~/git-demo/yanxisishi-todo-stats  58d0f01 [feature/stats]

$ cd "../yanxisishi-todo-stats"

$ git branch
  feature/complete-all
+ feature/export
  feature/sort
* feature/stats
  master

git config --global core.quotepath false

$ git config --global core.quotepath false

git add index.html
git commit -m "显示待办统计"

$ git add index.html

$ git commit -m "显示待办统计"
[feature/stats 66f6e24] 显示待办统计
 1 file changed, 1 insertion(+), 1 deletion(-)

git switch master
git merge feature/stats
git branch -d feature/stats

$ git switch master
Switched to branch 'master'

$ git merge feature/stats
Updating 58d0f01..66f6e24
Fast-forward
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

$ git branch -d feature/stats
Deleted branch feature/stats (was 66f6e24).

cd "../yanxisishi-todo"
git log master --oneline

$ cd "../yanxisishi-todo"

$ git log master --oneline
66f6e24 (master) 显示待办统计
58d0f01 Merge branch 'feature/clear-completed'
85ffbc3 完成清空已完成逻辑
24bce6a 修复截止日期删除线
50287b5 添加清空已完成按钮
c939f76 (feature/complete-all) 添加全部完成按钮和逻辑
81ec281 (feature/sort) 添加排序按钮和逻辑
d9b8f28 添加过期提醒
061b6d3 保存截止日期
8c63d15 添加截止日期输入
924fc03 添加 .gitignore
042d150 Revert "添加深色主题"
af6433b 添加深色主题
833ad39 添加项目说明
c380c36 添加待办页面

git worktree remove "../yanxisishi-todo-stats"
git worktree list

$ git worktree remove "../yanxisishi-todo-stats"

$ git worktree list
~/git-demo/yanxisishi-todo  ead87c5 [feature/export]

ssh-keygen -t ed25519 -C "yanxisishi@gmail.com"

The key fingerprint is:
SHA256:z5lZJZ4H2ZGiXYTJ1CwoUSpFOBJHq0DUNTX2BI8t9xM yanxisishi@gmail.com

cat ~/.ssh/id_ed25519.pub

ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFFXoztgGpx/0KfVjFnXi99df+PL3fVZqfwiC5uRNn4h yanxisishi@gmail.com

ssh -T git@github.com

Connection closed by 198.18.0.45 port 22

git remote add origin git@github.com:yanxisishi/yanxisishi-todo.git
git push -u origin master

$ git remote add origin git@github.com:yanxisishi/yanxisishi-todo.git

$ git push -u origin master
branch 'master' set up to track 'origin/master'.
To ~/git-demo/yanxisishi-todo.git
 * [new branch]      master -> master

git add README.md
git commit -m "更新项目说明"
git push

$ git add README.md

$ git commit -m "更新项目说明"
[master a8a5578] 更新项目说明
 1 file changed, 3 insertions(+)

$ git push
To ~/git-demo/yanxisishi-todo.git
   f72842e..a8a5578  master -> master

git clone git@github.com:yanxisishi/yanxisishi-todo.git "yanxisishi-todo"
cd "yanxisishi-todo"

$ git clone git@github.com:yanxisishi/yanxisishi-todo.git "yanxisishi-todo"
Cloning into 'yanxisishi-todo'...
done.

$ cd "yanxisishi-todo"

git status
rm -rf .git
git status

$ git status
On branch master
nothing to commit, working tree clean

$ rm -rf .git

$ git status
fatal: not a git repository (or any of the parent directories): .git

git remote -v
git remote remove origin
git remote -v

$ git remote -v
origin	git@github.com:yanxisishi/yanxisishi-todo.git (fetch)
origin	git@github.com:yanxisishi/yanxisishi-todo.git (push)

$ git remote remove origin

$ git remote -v