{"id":84261,"date":"2026-07-26T10:18:31","date_gmt":"2026-07-26T02:18:31","guid":{"rendered":"https:\/\/www.wsisp.com\/helps\/84261.html"},"modified":"2026-07-26T10:18:31","modified_gmt":"2026-07-26T02:18:31","slug":"git-%e6%93%8d%e4%bd%9c%e5%a4%a7%e5%85%a8","status":"publish","type":"post","link":"https:\/\/www.wsisp.com\/helps\/84261.html","title":{"rendered":"Git \u64cd\u4f5c\u5927\u5168"},"content":{"rendered":"

Git \u64cd\u4f5c\u5927\u5168<\/h2>\n

\u672c\u6587\u6863\u6db5\u76d6 Git \u4ece\u5165\u95e8\u5230\u9ad8\u7ea7\u7684\u5b8c\u6574\u64cd\u4f5c\u6307\u5357<\/p>\n

\n

\u4e00\u3001\u57fa\u7840\u914d\u7f6e<\/h3>\n

1.1 \u7528\u6237\u4fe1\u606f\u914d\u7f6e<\/h4>\n

# \u8bbe\u7f6e\u5168\u5c40\u7528\u6237\u540d（\u6240\u6709\u4ed3\u5e93\u751f\u6548）<\/span>
\ngit<\/span> config –global<\/span> user.name "Your Name"<\/span><\/p>\n

# \u8bbe\u7f6e\u5168\u5c40\u90ae\u7bb1<\/span>
\ngit<\/span> config –global<\/span> user.email "your.email@example.com"<\/span><\/p>\n

# \u4ec5\u5bf9\u5f53\u524d\u4ed3\u5e93\u8bbe\u7f6e\u7528\u6237\u540d（\u8986\u76d6\u5168\u5c40\u914d\u7f6e）<\/span>
\ngit<\/span> config user.name "Project Specific Name"<\/span><\/p>\n

# \u4ec5\u5bf9\u5f53\u524d\u4ed3\u5e93\u8bbe\u7f6e\u90ae\u7bb1<\/span>
\ngit<\/span> config user.email "project@example.com"<\/span><\/p>\n

1.2 \u7f16\u8f91\u5668\u914d\u7f6e<\/h4>\n

# \u8bbe\u7f6e\u9ed8\u8ba4\u7f16\u8f91\u5668\u4e3a VS Code<\/span>
\ngit<\/span> config –global<\/span> core.editor "code –wait"<\/span><\/p>\n

# \u8bbe\u7f6e\u9ed8\u8ba4\u7f16\u8f91\u5668\u4e3a Vim<\/span>
\ngit<\/span> config –global<\/span> core.editor "vim"<\/span><\/p>\n

# \u8bbe\u7f6e\u9ed8\u8ba4\u7f16\u8f91\u5668\u4e3a Nano<\/span>
\ngit<\/span> config –global<\/span> core.editor "nano"<\/span><\/p>\n

# Windows \u8bb0\u4e8b\u672c<\/span>
\ngit<\/span> config –global<\/span> core.editor "notepad"<\/span><\/p>\n

1.3 \u5dee\u5f02\u6bd4\u8f83\u5de5\u5177\u914d\u7f6e<\/h4>\n

# \u8bbe\u7f6e diff \u5de5\u5177\u4e3a VS Code<\/span>
\ngit<\/span> config –global<\/span> diff.tool vscode
\ngit<\/span> config –global<\/span> difftool.vscode.cmd 'code –wait –diff $LOCAL $REMOTE'<\/span><\/p>\n

# \u8bbe\u7f6e merge \u5de5\u5177\u4e3a VS Code<\/span>
\ngit<\/span> config –global<\/span> merge.tool vscode
\ngit<\/span> config –global<\/span> mergetool.vscode.cmd 'code –wait $MERGED'<\/span><\/p>\n

1.4 \u5176\u4ed6\u5e38\u7528\u914d\u7f6e<\/h4>\n

# \u8bbe\u7f6e\u9ed8\u8ba4\u5206\u652f\u540d（\u65b0\u5efa\u4ed3\u5e93\u65f6\u4f7f\u7528）<\/span>
\ngit<\/span> config –global<\/span> init.defaultBranch main<\/p>\n

# \u5f00\u542f\u989c\u8272\u8f93\u51fa<\/span>
\ngit<\/span> config –global<\/span> color.ui auto<\/p>\n

# \u8bbe\u7f6e\u6362\u884c\u7b26\u5904\u7406（Windows \u7528\u6237\u63a8\u8350）<\/span>
\ngit<\/span> config –global<\/span> core.autocrlf true<\/span> # \u63d0\u4ea4\u65f6\u8f6c LF，\u68c0\u51fa\u65f6\u8f6c CRLF<\/span>
\n# Linux\/Mac \u7528\u6237\u63a8\u8350<\/span>
\ngit<\/span> config –global<\/span> core.autocrlf input # \u63d0\u4ea4\u65f6\u8f6c LF，\u68c0\u51fa\u65f6\u4e0d\u8f6c\u6362<\/span><\/p>\n

# \u8bbe\u7f6e\u51ed\u8bc1\u7f13\u5b58\u65f6\u95f4（\u79d2）<\/span>
\ngit<\/span> config –global<\/span> credential.helper cache –timeout<\/span>=<\/span>3600<\/span><\/p>\n

# Windows \u4f7f\u7528 Git Credential Manager<\/span>
\ngit<\/span> config –global<\/span> credential.helper manager<\/p>\n

# \u67e5\u770b\u6240\u6709\u5168\u5c40\u914d\u7f6e<\/span>
\ngit<\/span> config –global<\/span> –list<\/span><\/p>\n

# \u67e5\u770b\u6240\u6709\u914d\u7f6e（\u5305\u62ec\u7cfb\u7edf\u3001\u5168\u5c40\u3001\u672c\u5730）<\/span>
\ngit<\/span> config –list<\/span><\/p>\n

# \u67e5\u770b\u67d0\u4e2a\u5177\u4f53\u914d\u7f6e<\/span>
\ngit<\/span> config user.name<\/p>\n

# \u5220\u9664\u67d0\u4e2a\u914d\u7f6e\u9879<\/span>
\ngit<\/span> config –global<\/span> –unset<\/span> user.name<\/p>\n

1.5 \u914d\u7f6e\u6587\u4ef6\u5c42\u7ea7<\/h4>\n

# Git \u6709\u4e09\u4e2a\u5c42\u7ea7\u7684\u914d\u7f6e\u6587\u4ef6，\u4f18\u5148\u7ea7\u4ece\u9ad8\u5230\u4f4e：
\n# 1. \u672c\u5730\u914d\u7f6e（.git\/config） -> –local \u4ec5\u5bf9\u5f53\u524d\u4ed3\u5e93\u751f\u6548
\n# 2. \u5168\u5c40\u914d\u7f6e（~\/.gitconfig） -> –global \u5bf9\u5f53\u524d\u7528\u6237\u6240\u6709\u4ed3\u5e93\u751f\u6548
\n# 3. \u7cfb\u7edf\u914d\u7f6e（\/etc\/gitconfig） -> –system \u5bf9\u6240\u6709\u7528\u6237\u751f\u6548<\/p>\n

# \u7f16\u8f91\u914d\u7f6e\u6587\u4ef6
\ngit config –global -e # \u7528\u7f16\u8f91\u5668\u6253\u5f00\u5168\u5c40\u914d\u7f6e\u6587\u4ef6
\ngit config –local -e # \u7528\u7f16\u8f91\u5668\u6253\u5f00\u672c\u5730\u914d\u7f6e\u6587\u4ef6<\/p>\n

\n

\u4e8c\u3001\u4ed3\u5e93\u521d\u59cb\u5316\u4e0e\u514b\u9686<\/h3>\n

2.1 \u521d\u59cb\u5316\u65b0\u4ed3\u5e93<\/h4>\n

# \u5728\u5f53\u524d\u76ee\u5f55\u521d\u59cb\u5316\u4e00\u4e2a\u65b0\u7684 Git \u4ed3\u5e93<\/span>
\ngit<\/span> init<\/p>\n

# \u521d\u59cb\u5316\u5e76\u6307\u5b9a\u76ee\u5f55\u540d<\/span>
\ngit<\/span> init my-project<\/p>\n

# \u521d\u59cb\u5316\u4e00\u4e2a\u88f8\u4ed3\u5e93（\u901a\u5e38\u7528\u4e8e\u670d\u52a1\u5668\u7aef）<\/span>
\ngit<\/span> init –bare<\/span> my-project.git<\/p>\n

# \u4f7f\u7528\u9ed8\u8ba4\u5206\u652f\u540d\u521d\u59cb\u5316（Git 2.28+）<\/span>
\ngit<\/span> init -b<\/span> main my-project<\/p>\n

2.2 \u514b\u9686\u8fdc\u7a0b\u4ed3\u5e93<\/h4>\n

# \u514b\u9686\u4ed3\u5e93（\u9ed8\u8ba4\u4f7f\u7528 HTTPS）<\/span>
\ngit<\/span> clone https:\/\/github.com\/user\/repo.git<\/p>\n

# \u514b\u9686\u5230\u6307\u5b9a\u76ee\u5f55<\/span>
\ngit<\/span> clone https:\/\/github.com\/user\/repo.git my-folder<\/p>\n

# \u4f7f\u7528 SSH \u514b\u9686（\u63a8\u8350，\u9700\u914d\u7f6e SSH Key）<\/span>
\ngit<\/span> clone git@github.com:user\/repo.git<\/p>\n

# \u514b\u9686\u6307\u5b9a\u5206\u652f<\/span>
\ngit<\/span> clone -b<\/span> develop https:\/\/github.com\/user\/repo.git<\/p>\n

# \u6d45\u514b\u9686（\u53ea\u514b\u9686\u6700\u8fd1 N \u6b21\u63d0\u4ea4，\u8282\u7701\u65f6\u95f4\u548c\u7a7a\u95f4）<\/span>
\ngit<\/span> clone –depth<\/span> 1<\/span> https:\/\/github.com\/user\/repo.git # \u53ea\u514b\u9686\u6700\u8fd1 1 \u6b21<\/span>
\ngit<\/span> clone –depth<\/span> 10<\/span> https:\/\/github.com\/user\/repo.git # \u514b\u9686\u6700\u8fd1 10 \u6b21<\/span><\/p>\n

# \u514b\u9686\u7279\u5b9a\u5206\u652f\u7684\u6d45\u514b\u9686<\/span>
\ngit<\/span> clone –depth<\/span> 1<\/span> -b<\/span> main https:\/\/github.com\/user\/repo.git<\/p>\n

# \u9012\u5f52\u514b\u9686（\u5305\u542b\u5b50\u6a21\u5757）<\/span>
\ngit<\/span> clone –recursive<\/span> https:\/\/github.com\/user\/repo.git<\/p>\n

# \u514b\u9686\u540e\u8865\u5145\u514b\u9686\u5b50\u6a21\u5757<\/span>
\ngit<\/span> clone https:\/\/github.com\/user\/repo.git
\ncd<\/span> repo
\ngit<\/span> submodule update –init<\/span> –recursive<\/span><\/p>\n

# \u7a00\u758f\u514b\u9686（\u53ea\u514b\u9686\u4ed3\u5e93\u7684\u90e8\u5206\u76ee\u5f55）<\/span>
\ngit<\/span> clone –filter<\/span>=<\/span>blob:none –sparse<\/span> https:\/\/github.com\/user\/repo.git
\ncd<\/span> repo
\ngit<\/span> sparse-checkout set<\/span> src\/ docs\/ # \u53ea\u68c0\u51fa src \u548c docs \u76ee\u5f55<\/span><\/p>\n

\n

\u4e09\u3001\u57fa\u672c\u5de5\u4f5c\u6d41<\/h3>\n

3.1 Git \u4e09\u4e2a\u533a\u57df<\/h4>\n

\u5de5\u4f5c\u533a（Working Directory） –> \u6682\u5b58\u533a（Staging Area\/Index） –> \u672c\u5730\u4ed3\u5e93（Repository）
\n \u4fee\u6539\u6587\u4ef6 git add git commit<\/p>\n

3.2 \u67e5\u770b\u72b6\u6001<\/h4>\n

# \u67e5\u770b\u5de5\u4f5c\u533a\u548c\u6682\u5b58\u533a\u7684\u72b6\u6001<\/span>
\ngit<\/span> status<\/p>\n

# \u7b80\u6d01\u6a21\u5f0f\u663e\u793a\u72b6\u6001<\/span>
\ngit<\/span> status -s<\/span>
\n# \u8f93\u51fa\u8bf4\u660e：<\/span>
\n# M \u6587\u4ef6\u540d \u2192 \u5df2\u4fee\u6539\u4e14\u5df2\u6682\u5b58<\/span>
\n# M \u6587\u4ef6\u540d \u2192 \u5df2\u4fee\u6539\u4f46\u672a\u6682\u5b58<\/span>
\n# A \u6587\u4ef6\u540d \u2192 \u65b0\u6dfb\u52a0\u5230\u6682\u5b58\u533a\u7684\u6587\u4ef6<\/span>
\n# D \u6587\u4ef6\u540d \u2192 \u5df2\u5220\u9664\u7684\u6587\u4ef6<\/span>
\n# R \u6587\u4ef6\u540d \u2192 \u91cd\u547d\u540d\u7684\u6587\u4ef6<\/span>
\n# ?? \u6587\u4ef6\u540d \u2192 \u672a\u8ddf\u8e2a\u7684\u65b0\u6587\u4ef6<\/span>
\n# MM \u6587\u4ef6\u540d \u2192 \u5df2\u4fee\u6539\u5e76\u6682\u5b58\u540e\u53c8\u5728\u5de5\u4f5c\u533a\u518d\u6b21\u4fee\u6539<\/span><\/p>\n

# \u67e5\u770b\u7b80\u77ed\u72b6\u6001（\u5206\u652f\u4fe1\u606f + \u7b80\u6d01\u6587\u4ef6\u72b6\u6001）<\/span>
\ngit<\/span> status -sb<\/span><\/p>\n

3.3 \u6dfb\u52a0\u5230\u6682\u5b58\u533a<\/h4>\n

# \u6dfb\u52a0\u5355\u4e2a\u6587\u4ef6<\/span>
\ngit<\/span> add<\/span> filename.txt<\/p>\n

# \u6dfb\u52a0\u591a\u4e2a\u6587\u4ef6<\/span>
\ngit<\/span> add<\/span> file1.txt file2.txt file3.txt<\/p>\n

# \u6dfb\u52a0\u5f53\u524d\u76ee\u5f55\u4e0b\u7684\u6240\u6709\u4fee\u6539（\u65b0\u589e + \u4fee\u6539 + \u5220\u9664）<\/span>
\ngit<\/span> add<\/span> .<\/span><\/p>\n

# \u6dfb\u52a0\u6240\u6709 .py \u6587\u4ef6<\/span>
\ngit<\/span> add<\/span> *.py<\/p>\n

# \u6dfb\u52a0 src \u76ee\u5f55\u4e0b\u6240\u6709\u6587\u4ef6<\/span>
\ngit<\/span> add<\/span> src\/<\/p>\n

# \u4ea4\u4e92\u5f0f\u6dfb\u52a0（\u53ef\u4ee5\u9009\u62e9\u8981\u6682\u5b58\u7684\u6587\u4ef6\u90e8\u5206\u4fee\u6539）<\/span>
\ngit<\/span> add<\/span> -p<\/span>
\n# \u4ea4\u4e92\u5f0f\u9009\u9879\u8bf4\u660e：<\/span>
\n# y – \u6682\u5b58\u8fd9\u4e2a\u533a\u5757<\/span>
\n# n – \u4e0d\u6682\u5b58\u8fd9\u4e2a\u533a\u5757<\/span>
\n# s – \u5c06\u5f53\u524d\u533a\u5757\u62c6\u5206\u4e3a\u66f4\u5c0f\u7684\u533a\u5757<\/span>
\n# e – \u624b\u52a8\u7f16\u8f91\u5f53\u524d\u533a\u5757<\/span>
\n# q – \u9000\u51fa<\/span><\/p>\n

# \u6dfb\u52a0\u5df2\u8ddf\u8e2a\u6587\u4ef6\u7684\u4fee\u6539（\u4e0d\u5305\u62ec\u65b0\u6587\u4ef6）<\/span>
\ngit<\/span> add<\/span> -u<\/span><\/p>\n

# \u5f3a\u5236\u6dfb\u52a0\u88ab .gitignore \u5ffd\u7565\u7684\u6587\u4ef6<\/span>
\ngit<\/span> add<\/span> -f<\/span> filename.txt<\/p>\n

3.4 \u63d0\u4ea4<\/h4>\n

# \u63d0\u4ea4\u6682\u5b58\u533a\u7684\u6240\u6709\u6587\u4ef6，\u6253\u5f00\u7f16\u8f91\u5668\u5199\u63d0\u4ea4\u4fe1\u606f<\/span>
\ngit<\/span> commit<\/p>\n

# \u4f7f\u7528 -m \u76f4\u63a5\u5199\u63d0\u4ea4\u4fe1\u606f<\/span>
\ngit<\/span> commit -m<\/span> "feat: \u6dfb\u52a0\u7528\u6237\u767b\u5f55\u529f\u80fd"<\/span><\/p>\n

# \u6dfb\u52a0\u6240\u6709\u5df2\u8ddf\u8e2a\u6587\u4ef6\u7684\u4fee\u6539\u5e76\u63d0\u4ea4（\u8df3\u8fc7 git add \u6b65\u9aa4）<\/span>
\ngit<\/span> commit -am<\/span> "fix: \u4fee\u590d\u767b\u5f55\u9a8c\u8bc1 bug"<\/span><\/p>\n

# \u4fee\u6539\u6700\u8fd1\u4e00\u6b21\u63d0\u4ea4\u7684\u4fe1\u606f<\/span>
\ngit<\/span> commit –amend<\/span><\/p>\n

# \u4fee\u6539\u6700\u8fd1\u4e00\u6b21\u63d0\u4ea4\u7684\u5185\u5bb9（\u4fdd\u6301\u63d0\u4ea4\u4fe1\u606f\u4e0d\u53d8）<\/span>
\ngit<\/span> add<\/span> forgotten-file.txt
\ngit<\/span> commit –amend<\/span> –no-edit<\/p>\n

# \u521b\u5efa\u7a7a\u63d0\u4ea4（\u5e38\u7528\u4e8e\u89e6\u53d1 CI）<\/span>
\ngit<\/span> commit –allow-empty -m<\/span> "chore: \u89e6\u53d1\u6784\u5efa"<\/span><\/p>\n

# \u4f7f\u7528\u6a21\u677f\u6587\u4ef6\u4f5c\u4e3a\u63d0\u4ea4\u4fe1\u606f<\/span>
\ngit<\/span> commit -t<\/span> .git\/commit-template.txt<\/p>\n

# \u7b7e\u540d\u63d0\u4ea4（GPG \u7b7e\u540d）<\/span>
\ngit<\/span> commit -S<\/span> -m<\/span> "feat: \u5b89\u5168\u7684\u63d0\u4ea4"<\/span><\/p>\n

3.5 \u63d0\u4ea4\u4fe1\u606f\u89c4\u8303（Conventional Commits）<\/h4>\n

\u5b8c\u6574\u683c\u5f0f<\/h5>\n

<type>(<scope>): <subject>
\n<body><\/p>\n

# – type: \u63d0\u4ea4\u7c7b\u578b，\u5fc5\u586b，\u89c1\u4e0b\u65b9\u7c7b\u578b\u8868
\n# – scope: \u5f71\u54cd\u8303\u56f4，\u53ef\u9009，\u7528\u5c0f\u62ec\u53f7\u5305\u88f9
\n# – subject: \u7b80\u8ff0，\u5fc5\u586b，\u7948\u4f7f\u53e5，\u9996\u5b57\u6bcd\u5c0f\u5199，\u7ed3\u5c3e\u4e0d\u52a0\u53e5\u53f7
\n# – \u603b\u957f\u5ea6\u4e0d\u8d85\u8fc7 50 \u4e2a\u5b57\u7b26<\/p>\n

type \u7c7b\u578b\u8868<\/h5>\n\n\u7c7b\u578b\u8bf4\u660e\u793a\u4f8b<\/tr>\n\n\n\n\n\n\n\n\n\n\n\n\n\n
feat<\/td>\n\u65b0\u529f\u80fd<\/td>\nfeat(auth): \u6dfb\u52a0\u5fae\u4fe1\u767b\u5f55<\/td>\n<\/tr>\n
fix<\/td>\n\u4fee\u590d bug<\/td>\nfix(api): \u4fee\u590d\u7a7a\u6307\u9488\u5f02\u5e38<\/td>\n<\/tr>\n
docs<\/td>\n\u6587\u6863\u53d8\u66f4<\/td>\ndocs(readme): \u66f4\u65b0\u5b89\u88c5\u8bf4\u660e<\/td>\n<\/tr>\n
style<\/td>\n\u4ee3\u7801\u683c\u5f0f（\u4e0d\u5f71\u54cd\u529f\u80fd）<\/td>\nstyle: \u7edf\u4e00\u7f29\u8fdb\u4e3a 4 \u7a7a\u683c<\/td>\n<\/tr>\n
refactor<\/td>\n\u91cd\u6784（\u4e0d\u65b0\u589e\u529f\u80fd\/\u4fee\u590d bug）<\/td>\nrefactor(db): \u62c6\u5206\u67e5\u8be2\u903b\u8f91<\/td>\n<\/tr>\n
perf<\/td>\n\u6027\u80fd\u4f18\u5316<\/td>\nperf(query): \u6dfb\u52a0\u7d22\u5f15\u52a0\u901f\u67e5\u8be2<\/td>\n<\/tr>\n
test<\/td>\n\u6d4b\u8bd5\u76f8\u5173<\/td>\ntest(auth): \u6dfb\u52a0\u767b\u5f55\u5355\u5143\u6d4b\u8bd5<\/td>\n<\/tr>\n
chore<\/td>\n\u6784\u5efa\/\u5de5\u5177\u53d8\u52a8<\/td>\nchore: \u5347\u7ea7 webpack \u5230 v5<\/td>\n<\/tr>\n
ci<\/td>\nCI\/CD \u914d\u7f6e<\/td>\nci: \u6dfb\u52a0 GitHub Actions \u5de5\u4f5c\u6d41<\/td>\n<\/tr>\n
build<\/td>\n\u6784\u5efa\u7cfb\u7edf\u6216\u5916\u90e8\u4f9d\u8d56<\/td>\nbuild: \u8fc1\u79fb\u5230 pnpm<\/td>\n<\/tr>\n
revert<\/td>\n\u56de\u9000\u63d0\u4ea4<\/td>\nrevert: \u56de\u9000 feat(auth)<\/td>\n<\/tr>\n
WIP<\/td>\n\u5de5\u4f5c\u8fdb\u884c\u4e2d（\u4e0d\u63a8\u8350\u63a8\u9001\u5230\u4e3b\u5206\u652f）<\/td>\nWIP: \u767b\u5f55\u529f\u80fd\u5f00\u53d1\u4e2d<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n
\u5b8c\u6574\u793a\u4f8b<\/h5>\n

feat(auth): \u6dfb\u52a0\u5fae\u4fe1 OAuth2.0 \u767b\u5f55\u529f\u80fd<\/p>\n

\u5b9e\u73b0\u4e86\u5fae\u4fe1\u626b\u7801\u767b\u5f55\u7684\u5b8c\u6574\u6d41\u7a0b：
\n– \u524d\u7aef\u6dfb\u52a0\u5fae\u4fe1\u767b\u5f55\u6309\u94ae\u548c\u4e8c\u7ef4\u7801\u5f39\u7a97
\n– \u540e\u7aef\u65b0\u589e \/api\/auth\/wechat \u56de\u8c03\u63a5\u53e3
\n– \u96c6\u6210 wechat-sdk \u5904\u7406 token \u4ea4\u6362
\n– \u7528\u6237\u9996\u6b21\u767b\u5f55\u81ea\u52a8\u521b\u5efa\u8d26\u53f7\u5e76\u7ed1\u5b9a\u624b\u673a\u53f7<\/p>\n

\u6027\u80fd\u65b9\u9762：
\n– \u7f13\u5b58 access_token，\u907f\u514d\u91cd\u590d\u8bf7\u6c42\u5fae\u4fe1\u63a5\u53e3
\n– \u4f7f\u7528 Redis \u5b58\u50a8\u4f1a\u8bdd\u72b6\u6001，\u6709\u6548\u671f 5 \u5206\u949f<\/p>\n

Closes #123
\nCloses #456
\nCo-authored-by: zhangsan <zhangsan@example.com><\/p>\n

fix(order): \u4fee\u590d\u8ba2\u5355\u91d1\u989d\u8ba1\u7b97\u7cbe\u5ea6\u4e22\u5931\u95ee\u9898<\/p>\n

\u4f7f\u7528 Decimal \u66ff\u4ee3 float \u8fdb\u884c\u91d1\u989d\u8fd0\u7b97，\u89e3\u51b3\u6d6e\u70b9\u6570\u7cbe\u5ea6\u95ee\u9898\u3002<\/p>\n

\u4fee\u6539\u524d：0.1 + 0.2 = 0.30000000000000004
\n\u4fee\u6539\u540e：0.1 + 0.2 = 0.3<\/p>\n

\u53d7\u5f71\u54cd\u6a21\u5757：\u8ba2\u5355\u521b\u5efa\u3001\u9000\u6b3e\u3001\u5bf9\u8d26<\/p>\n

Fixes #789<\/p>\n

refactor(user): \u91cd\u6784\u7528\u6237\u6743\u9650\u6821\u9a8c\u903b\u8f91<\/p>\n

\u5c06\u6563\u5e03\u5728\u5404 Controller \u4e2d\u7684\u6743\u9650\u6821\u9a8c\u4ee3\u7801\u7edf\u4e00\u62bd\u53d6\u5230
\n@RequirePermission \u6ce8\u89e3\u4e2d，\u901a\u8fc7 AOP \u62e6\u622a\u5668\u5b9e\u73b0\u3002<\/p>\n

\u53d8\u66f4\u5185\u5bb9：
\n– \u65b0\u589e @RequirePermission \u6ce8\u89e3
\n– \u65b0\u589e PermissionAspect \u5207\u9762
\n– \u79fb\u9664\u5404 Controller \u4e2d\u91cd\u590d\u7684\u6821\u9a8c\u4ee3\u7801
\n– \u66f4\u65b0\u76f8\u5173\u5355\u5143\u6d4b\u8bd5<\/p>\n

BREAKING CHANGE: \u79fb\u9664\u4e86\u65e7\u7684 checkPermission() \u65b9\u6cd5，
\n\u6240\u6709\u76f4\u63a5\u8c03\u7528\u8be5\u65b9\u6cd5\u7684\u5730\u65b9\u9700\u8981\u6539\u4e3a\u4f7f\u7528\u6ce8\u89e3\u65b9\u5f0f\u3002<\/p>\n

Closes #321<\/p>\n

chore(deps): \u5347\u7ea7 Spring Boot \u5230 3.2.0<\/p>\n

\u5347\u7ea7\u76f8\u5173\u4f9d\u8d56\u7248\u672c：
\n– Spring Boot: 2.7.18 -> 3.2.0
\n– Spring Security: 5.8.x -> 6.2.x
\n– Jakarta EE: javax.* -> jakarta.*<\/p>\n

\u5df2\u901a\u8fc7\u5168\u91cf\u56de\u5f52\u6d4b\u8bd5，\u65e0\u517c\u5bb9\u6027\u95ee\u9898\u3002<\/p>\n

Refs: https:\/\/spring.io\/blog\/2023\/11\/23\/spring-boot-3-2-0<\/p>\n

docs(api): \u66f4\u65b0 REST API \u6587\u6863<\/p>\n

– \u65b0\u589e\u7528\u6237\u7ba1\u7406\u63a5\u53e3\u6587\u6863（\/api\/users）
\n– \u66f4\u65b0\u8ba2\u5355\u63a5\u53e3\u7684\u8bf7\u6c42\u53c2\u6570\u8bf4\u660e
\n– \u8865\u5145\u9519\u8bef\u7801\u5217\u8868
\n– \u6dfb\u52a0 curl \u8c03\u7528\u793a\u4f8b<\/p>\n

fix: \u4fee\u590d\u767b\u5f55\u9875\u9762\u6837\u5f0f\u9519\u4f4d<\/p>\n

\u8c03\u6574\u79fb\u52a8\u7aef\u4e0b\u767b\u5f55\u8868\u5355\u7684\u5e03\u5c40，\u4fee\u590d\u5c0f\u5c4f\u5e55\u9002\u914d\u95ee\u9898\u3002<\/p>\n

Before: ![before](screenshots\/login-before.png)
\nAfter: ![after](screenshots\/login-after.png)<\/p>\n

Fixes #666<\/p>\n

\u5e38\u89c1\u9519\u8bef\u5199\u6cd5 vs \u6b63\u786e\u5199\u6cd5<\/h5>\n

# \u274c \u9519\u8bef\u5199\u6cd5
\ngit commit -m "fix bug" # \u592a\u6a21\u7cca
\ngit commit -m "update" # \u65e0\u610f\u4e49
\ngit commit -m "\u4fee\u6539\u4e86\u767b\u5f55\u529f\u80fd" # \u4e2d\u6587，\u672a\u4f7f\u7528\u89c4\u8303\u683c\u5f0f
\ngit commit -m "feat: \u6dfb\u52a0\u767b\u5f55\u529f\u80fd\u3002" # \u7ed3\u5c3e\u591a\u4e86\u53e5\u53f7
\ngit commit -m "Feat: add login" # type \u9996\u5b57\u6bcd\u5927\u5199
\ngit commit -m "FEAT(auth): ADD LOGIN" # \u5168\u5927\u5199
\ngit commit -m "feat(auth): \u6dfb\u52a0\u767b\u5f55\u529f\u80fd \u4fee\u590dbug" # \u6df7\u5408\u4e86\u4e24\u4e2a type<\/p>\n

# \u2705 \u6b63\u786e\u5199\u6cd5
\ngit commit -m "feat(auth): \u6dfb\u52a0\u5fae\u4fe1\u767b\u5f55\u529f\u80fd"
\ngit commit -m "fix(auth): \u4fee\u590d\u767b\u5f55\u9a8c\u8bc1\u7a7a\u6307\u9488\u5f02\u5e38"
\ngit commit -m "style: \u7edf\u4e00\u4ee3\u7801\u7f29\u8fdb\u4e3a 4 \u7a7a\u683c"
\ngit commit -m "docs(readme): \u66f4\u65b0\u90e8\u7f72\u6587\u6863"
\ngit commit -m "refactor(auth): \u62bd\u53d6\u6743\u9650\u6821\u9a8c\u5230 AOP \u5207\u9762"<\/p>\n

\n

\u56db\u3001\u5206\u652f\u7ba1\u7406<\/h3>\n

4.1 \u67e5\u770b\u5206\u652f<\/h4>\n

# \u67e5\u770b\u672c\u5730\u5206\u652f<\/span>
\ngit<\/span> branch<\/p>\n

# \u67e5\u770b\u6240\u6709\u5206\u652f（\u672c\u5730 + \u8fdc\u7a0b）<\/span>
\ngit<\/span> branch -a<\/span><\/p>\n

# \u67e5\u770b\u8fdc\u7a0b\u5206\u652f<\/span>
\ngit<\/span> branch -r<\/span><\/p>\n

# \u67e5\u770b\u672c\u5730\u5206\u652f\u53ca\u5176\u6700\u540e\u4e00\u6b21\u63d0\u4ea4<\/span>
\ngit<\/span> branch -v<\/span><\/p>\n

# \u67e5\u770b\u672c\u5730\u5206\u652f\u53ca\u5176\u4e0e\u8fdc\u7a0b\u5206\u652f\u7684\u5bf9\u5e94\u5173\u7cfb<\/span>
\ngit<\/span> branch -vv<\/span><\/p>\n

# \u67e5\u770b\u5df2\u5408\u5e76\u5230\u5f53\u524d\u5206\u652f\u7684\u5206\u652f<\/span>
\ngit<\/span> branch –merged<\/span><\/p>\n

# \u67e5\u770b\u672a\u5408\u5e76\u5230\u5f53\u524d\u5206\u652f\u7684\u5206\u652f<\/span>
\ngit<\/span> branch –no-merged<\/p>\n

4.2 \u521b\u5efa\u5206\u652f<\/h4>\n

# \u521b\u5efa\u65b0\u5206\u652f（\u4f46\u4e0d\u5207\u6362\u5230\u65b0\u5206\u652f）<\/span>
\ngit<\/span> branch feature\/login<\/p>\n

# \u57fa\u4e8e\u6307\u5b9a\u63d0\u4ea4\u521b\u5efa\u5206\u652f<\/span>
\ngit<\/span> branch feature\/login abc1234<\/p>\n

# \u57fa\u4e8e\u8fdc\u7a0b\u5206\u652f\u521b\u5efa\u672c\u5730\u5206\u652f<\/span>
\ngit<\/span> branch feature\/login origin\/feature\/login<\/p>\n

# \u521b\u5efa\u5b64\u513f\u5206\u652f（\u6ca1\u6709\u5386\u53f2\u7684\u7a7a\u5206\u652f，\u5e38\u7528\u4e8e gh-pages）<\/span>
\ngit<\/span> branch –orphan<\/span> gh-pages<\/p>\n

4.3 \u5207\u6362\u5206\u652f<\/h4>\n

# \u5207\u6362\u5230\u5df2\u6709\u5206\u652f<\/span>
\ngit<\/span> checkout develop<\/p>\n

# \u521b\u5efa\u5e76\u5207\u6362\u5230\u65b0\u5206\u652f（\u5e38\u7528）<\/span>
\ngit<\/span> checkout -b<\/span> feature\/login<\/p>\n

# \u57fa\u4e8e\u8fdc\u7a0b\u5206\u652f\u521b\u5efa\u5e76\u5207\u6362<\/span>
\ngit<\/span> checkout -b<\/span> feature\/login origin\/feature\/login<\/p>\n

# \u5207\u6362\u5230\u4e0a\u4e00\u4e2a\u5206\u652f（\u5feb\u901f\u5207\u6362）<\/span>
\ngit<\/span> checkout –<\/p>\n

# \u65b0\u547d\u4ee4（Git 2.23+）：\u5207\u6362\u5206\u652f<\/span>
\ngit<\/span> switch main<\/p>\n

# \u65b0\u547d\u4ee4：\u521b\u5efa\u5e76\u5207\u6362\u5230\u65b0\u5206\u652f<\/span>
\ngit<\/span> switch -c<\/span> feature\/login<\/p>\n

# \u65b0\u547d\u4ee4：\u5207\u6362\u5230\u4e0a\u4e00\u4e2a\u5206\u652f<\/span>
\ngit<\/span> switch –<\/p>\n

4.4 \u91cd\u547d\u540d\u5206\u652f<\/h4>\n

# \u91cd\u547d\u540d\u5f53\u524d\u5206\u652f<\/span>
\ngit<\/span> branch -m<\/span> new-branch-name<\/p>\n

# \u91cd\u547d\u540d\u6307\u5b9a\u5206\u652f<\/span>
\ngit<\/span> branch -m<\/span> old-name new-name<\/p>\n

# \u5f3a\u5236\u91cd\u547d\u540d（\u76ee\u6807\u5206\u652f\u5df2\u5b58\u5728\u65f6）<\/span>
\ngit<\/span> branch -M<\/span> new-name<\/p>\n

4.5 \u5220\u9664\u5206\u652f<\/h4>\n

# \u5220\u9664\u5df2\u5408\u5e76\u7684\u672c\u5730\u5206\u652f<\/span>
\ngit<\/span> branch -d<\/span> feature\/login<\/p>\n

# \u5f3a\u5236\u5220\u9664\u672c\u5730\u5206\u652f（\u672a\u5408\u5e76\u4e5f\u5220\u9664）<\/span>
\ngit<\/span> branch -D<\/span> feature\/login<\/p>\n

# \u5220\u9664\u8fdc\u7a0b\u5206\u652f<\/span>
\ngit<\/span> push origin –delete<\/span> feature\/login<\/p>\n

# \u53e6\u4e00\u79cd\u5220\u9664\u8fdc\u7a0b\u5206\u652f\u7684\u5199\u6cd5<\/span>
\ngit<\/span> push origin :feature\/login<\/p>\n

# \u6279\u91cf\u5220\u9664\u5df2\u5408\u5e76\u7684\u672c\u5730\u5206\u652f（\u4fdd\u7559 main \u548c\u5f53\u524d\u5206\u652f）<\/span>
\ngit<\/span> branch –merged<\/span> |<\/span> grep<\/span> -v<\/span> "main"<\/span> |<\/span> grep<\/span> -v<\/span> "^\\\\*"<\/span> |<\/span> xargs<\/span> git<\/span> branch -d<\/span><\/p>\n

4.6 \u5206\u652f\u5de5\u4f5c\u6d41\u793a\u4f8b<\/h4>\n

# === \u529f\u80fd\u5f00\u53d1\u6d41\u7a0b ===<\/span><\/p>\n

# 1. \u4ece main \u521b\u5efa\u529f\u80fd\u5206\u652f<\/span>
\ngit<\/span> checkout main
\ngit<\/span> pull origin main
\ngit<\/span> checkout -b<\/span> feature\/user-profile<\/p>\n

# 2. \u5728\u529f\u80fd\u5206\u652f\u4e0a\u5f00\u53d1\u5e76\u63d0\u4ea4<\/span>
\ngit<\/span> add<\/span> .<\/span>
\ngit<\/span> commit -m<\/span> "feat(profile): \u6dfb\u52a0\u7528\u6237\u8d44\u6599\u9875\u9762"<\/span><\/p>\n

# 3. \u63a8\u9001\u529f\u80fd\u5206\u652f\u5230\u8fdc\u7a0b<\/span>
\ngit<\/span> push origin feature\/user-profile<\/p>\n

# 4. \u521b\u5efa Pull Request \/ Merge Request<\/span><\/p>\n

# 5. \u5408\u5e76\u540e\u6e05\u7406\u5206\u652f<\/span>
\ngit<\/span> checkout main
\ngit<\/span> pull origin main
\ngit<\/span> branch -d<\/span> feature\/user-profile
\ngit<\/span> push origin –delete<\/span> feature\/user-profile<\/p>\n

\n

\u4e94\u3001\u67e5\u770b\u5386\u53f2\u4e0e\u72b6\u6001<\/h3>\n

5.1 \u67e5\u770b\u63d0\u4ea4\u5386\u53f2<\/h4>\n

# \u67e5\u770b\u5b8c\u6574\u63d0\u4ea4\u5386\u53f2<\/span>
\ngit<\/span> log<\/p>\n

# \u7b80\u6d01\u6a21\u5f0f（\u4e00\u884c\u663e\u793a）<\/span>
\ngit<\/span> log –oneline<\/span><\/p>\n

# \u56fe\u5f62\u5316\u663e\u793a\u5206\u652f\u5408\u5e76\u5386\u53f2<\/span>
\ngit<\/span> log –graph<\/span> –oneline<\/span> –all<\/span><\/p>\n

# \u5e26\u989c\u8272\u7684\u56fe\u5f62\u5316\u663e\u793a<\/span>
\ngit<\/span> log –graph<\/span> –pretty<\/span>=<\/span>format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'<\/span> –abbrev-commit<\/p>\n

# \u67e5\u770b\u6700\u8fd1 N \u6b21\u63d0\u4ea4<\/span>
\ngit<\/span> log -5<\/span><\/p>\n

# \u67e5\u770b\u67d0\u4e2a\u6587\u4ef6\u7684\u4fee\u6539\u5386\u53f2<\/span>
\ngit<\/span> log filename.txt<\/p>\n

# \u67e5\u770b\u67d0\u4e2a\u6587\u4ef6\u7684\u4fee\u6539\u5386\u53f2，\u663e\u793a\u6bcf\u6b21\u4fee\u6539\u7684\u5177\u4f53\u5185\u5bb9<\/span>
\ngit<\/span> log -p<\/span> filename.txt<\/p>\n

# \u67e5\u770b\u67d0\u4e2a\u76ee\u5f55\u7684\u4fee\u6539\u5386\u53f2<\/span>
\ngit<\/span> log src\/<\/p>\n

# \u641c\u7d22\u63d0\u4ea4\u4fe1\u606f<\/span>
\ngit<\/span> log –grep<\/span>=<\/span>"\u767b\u5f55"<\/span><\/p>\n

# \u641c\u7d22\u5f15\u5165\u4e86\u7279\u5b9a\u5185\u5bb9\u7684\u63d0\u4ea4（\u641c\u7d22\u4ee3\u7801\u53d8\u66f4）<\/span>
\ngit<\/span> log -S<\/span> "function_name"<\/span> # \u67e5\u627e\u6dfb\u52a0\u6216\u5220\u9664\u4e86 "function_name" \u7684\u63d0\u4ea4<\/span><\/p>\n

# \u4f7f\u7528\u6b63\u5219\u641c\u7d22\u4ee3\u7801\u53d8\u66f4<\/span>
\ngit<\/span> log -G<\/span> "regex_pattern"<\/span><\/p>\n

# \u67e5\u770b\u67d0\u4e2a\u4f5c\u8005\u7684\u63d0\u4ea4<\/span>
\ngit<\/span> log –author<\/span>=<\/span>"John"<\/span><\/p>\n

# \u67e5\u770b\u6307\u5b9a\u65e5\u671f\u4e4b\u540e\u7684\u63d0\u4ea4<\/span>
\ngit<\/span> log –since<\/span>=<\/span>"2024-01-01"<\/span><\/p>\n

# \u67e5\u770b\u6307\u5b9a\u65e5\u671f\u4e4b\u524d\u7684\u63d0\u4ea4<\/span>
\ngit<\/span> log –until<\/span>=<\/span>"2024-12-31"<\/span><\/p>\n

# \u67e5\u770b\u6307\u5b9a\u65e5\u671f\u8303\u56f4\u5185\u7684\u63d0\u4ea4<\/span>
\ngit<\/span> log –since<\/span>=<\/span>"2024-01-01"<\/span> –until<\/span>=<\/span>"2024-06-30"<\/span><\/p>\n

# \u67e5\u770b\u4e24\u4e2a\u5206\u652f\u4e4b\u95f4\u7684\u5dee\u5f02\u63d0\u4ea4<\/span>
\ngit<\/span> log main..<\/span>feature\/login<\/p>\n

# \u67e5\u770b\u4e0d\u5728 feature\/login \u4e2d\u4f46\u5728 main \u4e2d\u7684\u63d0\u4ea4<\/span>
\ngit<\/span> log feature\/login..<\/span>main<\/p>\n

# \u663e\u793a\u6bcf\u6b21\u63d0\u4ea4\u7684\u7edf\u8ba1\u4fe1\u606f（\u4fee\u6539\u4e86\u54ea\u4e9b\u6587\u4ef6，\u5404\u4fee\u6539\u4e86\u591a\u5c11\u884c）<\/span>
\ngit<\/span> log –stat<\/span><\/p>\n

# \u663e\u793a\u6bcf\u6b21\u63d0\u4ea4\u7684\u7b80\u8981\u7edf\u8ba1<\/span>
\ngit<\/span> log –shortstat<\/span><\/p>\n

# \u53ea\u663e\u793a\u5408\u5e76\u63d0\u4ea4<\/span>
\ngit<\/span> log –merges<\/span><\/p>\n

# \u4e0d\u663e\u793a\u5408\u5e76\u63d0\u4ea4<\/span>
\ngit<\/span> log –no-merges<\/p>\n

5.2 \u67e5\u770b\u5dee\u5f02<\/h4>\n

# \u67e5\u770b\u5de5\u4f5c\u533a\u4e0e\u6682\u5b58\u533a\u7684\u5dee\u5f02（\u672a add \u7684\u4fee\u6539）<\/span>
\ngit<\/span> diff<\/span><\/p>\n

# \u67e5\u770b\u6682\u5b58\u533a\u4e0e\u4e0a\u6b21\u63d0\u4ea4\u7684\u5dee\u5f02（\u5df2 add \u4f46\u672a commit \u7684\u4fee\u6539）<\/span>
\ngit<\/span> diff<\/span> –staged<\/span>
\ngit<\/span> diff<\/span> –cached<\/span> # \u540c\u4e0a，\u4e24\u79cd\u5199\u6cd5\u90fd\u53ef\u4ee5<\/span><\/p>\n

# \u67e5\u770b\u5de5\u4f5c\u533a\u4e0e\u4e0a\u6b21\u63d0\u4ea4\u7684\u5dee\u5f02（\u6240\u6709\u4fee\u6539）<\/span>
\ngit<\/span> diff<\/span> HEAD<\/p>\n

# \u6bd4\u8f83\u4e24\u4e2a\u5206\u652f<\/span>
\ngit<\/span> diff<\/span> main..<\/span>feature\/login<\/p>\n

# \u6bd4\u8f83\u4e24\u4e2a\u5206\u652f，\u53ea\u663e\u793a\u6587\u4ef6\u540d<\/span>
\ngit<\/span> diff<\/span> main..<\/span>feature\/login –name-only<\/p>\n

# \u6bd4\u8f83\u4e24\u4e2a\u5206\u652f，\u663e\u793a\u6587\u4ef6\u540d\u548c\u72b6\u6001（\u589e\u5220\u6539）<\/span>
\ngit<\/span> diff<\/span> main..<\/span>feature\/login –name-status<\/p>\n

# \u6bd4\u8f83\u4e24\u4e2a\u5206\u652f，\u663e\u793a\u7edf\u8ba1\u4fe1\u606f<\/span>
\ngit<\/span> diff<\/span> main..<\/span>feature\/login –stat<\/span><\/p>\n

# \u67e5\u770b\u67d0\u4e2a\u6587\u4ef6\u5728\u5de5\u4f5c\u533a\u4e0e\u6682\u5b58\u533a\u7684\u5dee\u5f02<\/span>
\ngit<\/span> diff<\/span> filename.txt<\/p>\n

# \u67e5\u770b\u67d0\u4e2a\u6587\u4ef6\u5728\u6682\u5b58\u533a\u4e0e\u4e0a\u6b21\u63d0\u4ea4\u7684\u5dee\u5f02<\/span>
\ngit<\/span> diff<\/span> –staged<\/span> filename.txt<\/p>\n

# \u6bd4\u8f83\u4e24\u4e2a\u63d0\u4ea4\u4e4b\u95f4\u7684\u5dee\u5f02<\/span>
\ngit<\/span> diff<\/span> abc1234 def5678<\/p>\n

# \u6bd4\u8f83\u4e24\u4e2a\u63d0\u4ea4，\u53ea\u663e\u793a\u6587\u4ef6\u540d<\/span>
\ngit<\/span> diff<\/span> abc1234 def5678 –name-only<\/p>\n

# \u67e5\u770b\u67d0\u4e2a\u6587\u4ef6\u5728\u4e24\u4e2a\u63d0\u4ea4\u4e4b\u95f4\u7684\u5dee\u5f02<\/span>
\ngit<\/span> diff<\/span> abc1234 def5678 — filename.txt<\/p>\n

# \u6bd4\u8f83\u4e24\u4e2a\u6807\u7b7e<\/span>
\ngit<\/span> diff<\/span> v1.0.0 v2.0.0<\/p>\n

# \u5ffd\u7565\u7a7a\u767d\u5b57\u7b26\u5dee\u5f02<\/span>
\ngit<\/span> diff<\/span> -w<\/span>
\ngit<\/span> diff<\/span> –ignore-all-space<\/p>\n

# \u53ea\u663e\u793a\u4fee\u6539\u7684\u6587\u4ef6\u540d（\u4e0d\u770b\u5177\u4f53\u5dee\u5f02）<\/span>
\ngit<\/span> diff<\/span> –name-only
\ngit<\/span> diff<\/span> –name-status # \u663e\u793a\u72b6\u6001\u5b57\u6bcd A(\u65b0\u589e) M(\u4fee\u6539) D(\u5220\u9664)<\/span><\/p>\n

5.3 \u67e5\u770b\u5177\u4f53\u63d0\u4ea4<\/h4>\n

# \u67e5\u770b\u67d0\u4e2a\u63d0\u4ea4\u7684\u8be6\u7ec6\u4fe1\u606f<\/span>
\ngit<\/span> show abc1234<\/p>\n

# \u67e5\u770b\u67d0\u4e2a\u63d0\u4ea4\u7684\u4fee\u6539\u5185\u5bb9<\/span>
\ngit<\/span> show abc1234 –stat<\/span> # \u663e\u793a\u4fee\u6539\u7edf\u8ba1<\/span>
\ngit<\/span> show abc1234 — filename.txt # \u53ea\u770b\u67d0\u4e2a\u6587\u4ef6\u7684\u4fee\u6539<\/span><\/p>\n

# \u67e5\u770b\u6700\u65b0\u63d0\u4ea4<\/span>
\ngit<\/span> show HEAD<\/p>\n

# \u67e5\u770b\u4e0a\u4e00\u6b21\u63d0\u4ea4<\/span>
\ngit<\/span> show HEAD~1<\/p>\n

# \u67e5\u770b HEAD \u524d N \u6b21\u63d0\u4ea4<\/span>
\ngit<\/span> show HEAD~N<\/p>\n

# \u53ea\u770b\u67d0\u4e2a\u63d0\u4ea4\u7684\u63d0\u4ea4\u4fe1\u606f<\/span>
\ngit<\/span> log -1<\/span> –format<\/span>=<\/span>"%B"<\/span> abc1234<\/p>\n

# \u67e5\u770b\u67d0\u4e2a\u63d0\u4ea4\u4e2d\u7684\u67d0\u4e2a\u6587\u4ef6\u5185\u5bb9<\/span>
\ngit<\/span> show abc1234:src\/main.py<\/p>\n

5.4 \u641c\u7d22\u4ee3\u7801<\/h4>\n

# \u5728\u6240\u6709\u5df2\u8ddf\u8e2a\u6587\u4ef6\u4e2d\u641c\u7d22\u6587\u672c<\/span>
\ngit<\/span> grep<\/span> "search_term"<\/span><\/p>\n

# \u641c\u7d22\u5e76\u663e\u793a\u884c\u53f7<\/span>
\ngit<\/span> grep<\/span> -n<\/span> "search_term"<\/span><\/p>\n

# \u4e0d\u533a\u5206\u5927\u5c0f\u5199\u641c\u7d22<\/span>
\ngit<\/span> grep<\/span> -i<\/span> "search_term"<\/span><\/p>\n

# \u641c\u7d22\u5e76\u663e\u793a\u4e0a\u4e0b\u6587<\/span>
\ngit<\/span> grep<\/span> -C<\/span> 3<\/span> "search_term"<\/span> # \u524d\u540e\u5404 3 \u884c<\/span><\/p>\n

# \u5728\u7279\u5b9a\u7248\u672c\u4e2d\u641c\u7d22<\/span>
\ngit<\/span> grep<\/span> "search_term"<\/span> abc1234<\/p>\n

# \u5728\u6240\u6709\u63d0\u4ea4\u4e2d\u641c\u7d22（bisect \u7684\u66ff\u4ee3\u65b9\u6848）<\/span>
\ngit<\/span> log -S<\/span> "search_term"<\/span> –oneline<\/span><\/p>\n

# \u4f7f\u7528\u6b63\u5219\u8868\u8fbe\u5f0f\u641c\u7d22<\/span>
\ngit<\/span> grep<\/span> -E<\/span> "regex_pattern"<\/span><\/p>\n

5.5 \u6587\u4ef6\u8ffd\u6eaf（Blame）<\/h4>\n

# \u67e5\u770b\u6587\u4ef6\u6bcf\u4e00\u884c\u6700\u540e\u4fee\u6539\u7684\u63d0\u4ea4\u548c\u4f5c\u8005<\/span>
\ngit<\/span> blame filename.txt<\/p>\n

# \u67e5\u770b\u6587\u4ef6\u7279\u5b9a\u884c\u8303\u56f4\u7684\u4fee\u6539\u5386\u53f2<\/span>
\ngit<\/span> blame -L<\/span> 10,20<\/span> filename.txt # \u7b2c 10 \u5230 20 \u884c<\/span><\/p>\n

# \u67e5\u770b\u6587\u4ef6\u7279\u5b9a\u884c\u5f00\u59cb\u7684 N \u884c<\/span>
\ngit<\/span> blame -L<\/span> 10<\/span>,+5 filename.txt # \u4ece\u7b2c 10 \u884c\u5f00\u59cb\u7684 5 \u884c<\/span><\/p>\n

# \u5ffd\u7565\u7a7a\u767d\u5b57\u7b26\u4fee\u6539<\/span>
\ngit<\/span> blame -w<\/span> filename.txt<\/p>\n

# \u663e\u793a\u5b8c\u6574\u7684\u63d0\u4ea4\u54c8\u5e0c<\/span>
\ngit<\/span> blame –abbrev<\/span>=<\/span>40<\/span> filename.txt<\/p>\n

# \u8ffd\u6eaf\u67d0\u4e2a\u7279\u5b9a\u63d0\u4ea4\u65f6\u7684\u6587\u4ef6\u5185\u5bb9<\/span>
\ngit<\/span> blame abc1234 — filename.txt<\/p>\n

\n

\u516d\u3001\u64a4\u9500\u4e0e\u56de\u9000<\/h3>\n

6.1 \u64a4\u9500\u5de5\u4f5c\u533a\u4fee\u6539<\/h4>\n

# \u64a4\u9500\u5355\u4e2a\u6587\u4ef6\u7684\u4fee\u6539（\u6062\u590d\u5230\u6682\u5b58\u533a\u6216\u4e0a\u6b21\u63d0\u4ea4\u7684\u72b6\u6001）<\/span>
\ngit<\/span> checkout — filename.txt<\/p>\n

# \u65b0\u547d\u4ee4（Git 2.23+）<\/span>
\ngit<\/span> restore filename.txt<\/p>\n

# \u64a4\u9500\u6240\u6709\u5de5\u4f5c\u533a\u4fee\u6539<\/span>
\ngit<\/span> checkout — .<\/span><\/p>\n

# \u65b0\u547d\u4ee4<\/span>
\ngit<\/span> restore .<\/span><\/p>\n

# \u64a4\u9500\u5de5\u4f5c\u533a\u5bf9\u67d0\u6587\u4ef6\u7684\u4fee\u6539，\u6062\u590d\u5230\u6307\u5b9a\u63d0\u4ea4\u7684\u72b6\u6001<\/span>
\ngit<\/span> checkout abc1234 — filename.txt<\/p>\n

6.2 \u64a4\u9500\u6682\u5b58（unstage）<\/h4>\n

# \u5c06\u6587\u4ef6\u4ece\u6682\u5b58\u533a\u79fb\u56de\u5de5\u4f5c\u533a<\/span>
\ngit<\/span> reset HEAD filename.txt<\/p>\n

# \u65b0\u547d\u4ee4（Git 2.23+）<\/span>
\ngit<\/span> restore –staged<\/span> filename.txt<\/p>\n

# \u64a4\u9500\u6240\u6709\u6682\u5b58<\/span>
\ngit<\/span> reset HEAD<\/p>\n

# \u65b0\u547d\u4ee4<\/span>
\ngit<\/span> restore –staged<\/span> .<\/span><\/p>\n

6.3 \u56de\u9000\u63d0\u4ea4<\/h4>\n

# \u56de\u9000\u5230\u67d0\u4e2a\u63d0\u4ea4，\u4fdd\u7559\u4fee\u6539\u5728\u5de5\u4f5c\u533a（\u8f6f\u56de\u9000）<\/span>
\ngit<\/span> reset –soft<\/span> HEAD~1<\/p>\n

# \u56de\u9000\u5230\u67d0\u4e2a\u63d0\u4ea4，\u4fdd\u7559\u4fee\u6539\u5728\u6682\u5b58\u533a（\u6df7\u5408\u56de\u9000，\u9ed8\u8ba4\u6a21\u5f0f）<\/span>
\ngit<\/span> reset HEAD~1
\ngit<\/span> reset –mixed<\/span> HEAD~1<\/p>\n

# \u56de\u9000\u5230\u67d0\u4e2a\u63d0\u4ea4，\u4e22\u5f03\u6240\u6709\u4fee\u6539（\u786c\u56de\u9000，\u5371\u9669！）<\/span>
\ngit<\/span> reset –hard<\/span> HEAD~1<\/p>\n

# \u56de\u9000\u5230\u67d0\u4e2a\u6307\u5b9a\u63d0\u4ea4<\/span>
\ngit<\/span> reset –hard<\/span> abc1234<\/p>\n

# === \u533a\u522b\u8bf4\u660e ===<\/span>
\n# –soft: \u56de\u9000\u63d0\u4ea4，\u4fdd\u7559\u6682\u5b58\u533a\u548c\u5de5\u4f5c\u533a\u7684\u4fee\u6539<\/span>
\n# –mixed: \u56de\u9000\u63d0\u4ea4\u548c\u6682\u5b58\u533a，\u4fdd\u7559\u5de5\u4f5c\u533a\u7684\u4fee\u6539（\u9ed8\u8ba4）<\/span>
\n# –hard: \u56de\u9000\u63d0\u4ea4\u3001\u6682\u5b58\u533a\u548c\u5de5\u4f5c\u533a，\u6240\u6709\u4fee\u6539\u5168\u90e8\u4e22\u5931<\/span><\/p>\n

6.4 \u53cd\u8f6c\u63d0\u4ea4（\u5b89\u5168\u7684\u64a4\u9500\u65b9\u5f0f）<\/h4>\n

# \u521b\u5efa\u4e00\u4e2a\u65b0\u63d0\u4ea4\u6765\u64a4\u9500\u6307\u5b9a\u63d0\u4ea4\u7684\u4fee\u6539（\u63a8\u8350\u7528\u4e8e\u5df2\u63a8\u9001\u7684\u63d0\u4ea4）<\/span>
\ngit<\/span> revert abc1234<\/p>\n

# \u53cd\u8f6c\u63d0\u4ea4\u4f46\u4e0d\u81ea\u52a8\u63d0\u4ea4（\u53ef\u4ee5\u7ee7\u7eed\u4fee\u6539\u540e\u518d\u63d0\u4ea4）<\/span>
\ngit<\/span> revert –no-commit abc1234<\/p>\n

# \u53cd\u8f6c\u6700\u8fd1 3 \u6b21\u63d0\u4ea4<\/span>
\ngit<\/span> revert HEAD~2..<\/span>HEAD<\/p>\n

# \u53cd\u8f6c\u5408\u5e76\u63d0\u4ea4（\u9700\u8981\u6307\u5b9a\u4fdd\u7559\u54ea\u4e2a\u7236\u63d0\u4ea4）<\/span>
\ngit<\/span> revert -m<\/span> 1<\/span> <<\/span>merge-commit-hash><\/span>
\n# -m 1 \u8868\u793a\u4fdd\u7559\u7b2c\u4e00\u4e2a\u7236\u63d0\u4ea4（\u901a\u5e38\u662f\u4e3b\u5206\u652f）\u7684\u5185\u5bb9<\/span><\/p>\n

6.5 \u6062\u590d\u5df2\u5220\u9664\u7684\u5185\u5bb9<\/h4>\n

# \u6062\u590d\u5df2\u5220\u9664\u7684\u6587\u4ef6<\/span>
\ngit<\/span> checkout HEAD — filename.txt<\/p>\n

# \u5982\u679c\u6587\u4ef6\u5df2\u7ecf\u88ab\u63d0\u4ea4\u5220\u9664\u4e86，\u4ece\u5386\u53f2\u4e2d\u6062\u590d<\/span>
\ngit<\/span> log –diff-filter=<\/span>D –summary<\/span> # \u627e\u5230\u5220\u9664\u6587\u4ef6\u7684\u63d0\u4ea4<\/span>
\ngit<\/span> checkout abc1234~1 — filename.txt # \u4ece\u5220\u9664\u524d\u7684\u63d0\u4ea4\u6062\u590d<\/span><\/p>\n

# \u6062\u590d\u5230\u6307\u5b9a\u63d0\u4ea4\u7684\u5b8c\u6574\u72b6\u6001（\u521b\u5efa\u65b0\u63d0\u4ea4）<\/span>
\ngit<\/span> revert HEAD<\/p>\n

# \u4f7f\u7528 reflog \u627e\u5230\u4e22\u5931\u7684\u63d0\u4ea4<\/span>
\ngit<\/span> reflog
\n# \u627e\u5230\u4e22\u5931\u63d0\u4ea4\u7684\u54c8\u5e0c\u540e<\/span>
\ngit<\/span> checkout abc1234
\n# \u6216\u521b\u5efa\u65b0\u5206\u652f\u6307\u5411\u5b83<\/span>
\ngit<\/span> branch recover-branch abc1234<\/p>\n

6.6 \u6682\u5b58\u5de5\u4f5c\u533a（\u5e26\u51b2\u7a81\u65f6\u7684\u5904\u7406）<\/h4>\n

# \u5f53\u9700\u8981\u56de\u9000\u4f46\u6709\u51b2\u7a81\u65f6<\/span>
\ngit<\/span> stash # \u5148\u6682\u5b58\u5f53\u524d\u4fee\u6539<\/span>
\ngit<\/span> reset –hard<\/span> HEAD~1 # \u56de\u9000\u63d0\u4ea4<\/span>
\ngit<\/span> stash pop # \u6062\u590d\u6682\u5b58\u7684\u4fee\u6539<\/span>
\n# \u5982\u679c pop \u65f6\u6709\u51b2\u7a81，\u624b\u52a8\u89e3\u51b3\u540e<\/span>
\ngit<\/span> add<\/span> .<\/span>
\ngit<\/span> stash drop # \u5220\u9664\u5df2\u5e94\u7528\u7684 stash<\/span><\/p>\n

\n

\u4e03\u3001\u8fdc\u7a0b\u4ed3\u5e93\u64cd\u4f5c<\/h3>\n

7.1 \u67e5\u770b\u8fdc\u7a0b\u4ed3\u5e93<\/h4>\n

# \u67e5\u770b\u8fdc\u7a0b\u4ed3\u5e93\u5217\u8868<\/span>
\ngit<\/span> remote<\/p>\n

# \u67e5\u770b\u8fdc\u7a0b\u4ed3\u5e93\u8be6\u7ec6\u4fe1\u606f（URL \u548c\u8ddf\u8e2a\u4fe1\u606f）<\/span>
\ngit<\/span> remote -v<\/span><\/p>\n

# \u67e5\u770b\u67d0\u4e2a\u8fdc\u7a0b\u4ed3\u5e93\u7684\u8be6\u7ec6\u4fe1\u606f<\/span>
\ngit<\/span> remote show origin<\/p>\n

7.2 \u6dfb\u52a0\u8fdc\u7a0b\u4ed3\u5e93<\/h4>\n

# \u6dfb\u52a0\u8fdc\u7a0b\u4ed3\u5e93<\/span>
\ngit<\/span> remote add<\/span> origin https:\/\/github.com\/user\/repo.git<\/p>\n

# \u6dfb\u52a0\u591a\u4e2a\u8fdc\u7a0b\u4ed3\u5e93<\/span>
\ngit<\/span> remote add<\/span> upstream https:\/\/github.com\/original\/repo.git<\/p>\n

# \u4f7f\u7528 SSH \u6dfb\u52a0<\/span>
\ngit<\/span> remote add<\/span> origin git@github.com:user\/repo.git<\/p>\n

7.3 \u4fee\u6539\u8fdc\u7a0b\u4ed3\u5e93<\/h4>\n

# \u4fee\u6539\u8fdc\u7a0b\u4ed3\u5e93 URL<\/span>
\ngit<\/span> remote set-url origin https:\/\/github.com\/user\/new-repo.git<\/p>\n

# \u4fee\u6539\u8fdc\u7a0b\u4ed3\u5e93 URL \u4e3a SSH<\/span>
\ngit<\/span> remote set-url origin git@github.com:user\/repo.git<\/p>\n

# \u91cd\u547d\u540d\u8fdc\u7a0b\u4ed3\u5e93<\/span>
\ngit<\/span> remote rename<\/span> origin upstream<\/p>\n

# \u5220\u9664\u8fdc\u7a0b\u4ed3\u5e93\u5f15\u7528<\/span>
\ngit<\/span> remote remove upstream<\/p>\n

7.4 \u63a8\u9001<\/h4>\n

# \u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93（\u9996\u6b21\u63a8\u9001\u5e76\u8bbe\u7f6e\u4e0a\u6e38\u5206\u652f）<\/span>
\ngit<\/span> push -u<\/span> origin main<\/p>\n

# \u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93（\u5df2\u8bbe\u7f6e\u4e0a\u6e38\u5206\u652f\u540e）<\/span>
\ngit<\/span> push<\/p>\n

# \u63a8\u9001\u6307\u5b9a\u5206\u652f<\/span>
\ngit<\/span> push origin feature\/login<\/p>\n

# \u63a8\u9001\u6240\u6709\u672c\u5730\u5206\u652f<\/span>
\ngit<\/span> push –all<\/span> origin<\/p>\n

# \u63a8\u9001\u6807\u7b7e<\/span>
\ngit<\/span> push origin v1.0.0<\/p>\n

# \u63a8\u9001\u6240\u6709\u6807\u7b7e<\/span>
\ngit<\/span> push origin –tags<\/span><\/p>\n

# \u5f3a\u5236\u63a8\u9001（\u5371\u9669！\u4f1a\u8986\u76d6\u8fdc\u7a0b\u5386\u53f2）<\/span>
\ngit<\/span> push –force<\/span> origin main
\ngit<\/span> push -f<\/span> origin main<\/p>\n

# \u5b89\u5168\u7684\u5f3a\u5236\u63a8\u9001（\u5982\u679c\u8fdc\u7a0b\u5206\u652f\u6709\u65b0\u63d0\u4ea4\u4f1a\u62d2\u7edd）<\/span>
\ngit<\/span> push –force-with-lease origin main<\/p>\n

# \u5220\u9664\u8fdc\u7a0b\u5206\u652f<\/span>
\ngit<\/span> push origin –delete<\/span> feature\/login<\/p>\n

# \u63a8\u9001\u5e76\u8bbe\u7f6e\u4e0a\u6e38\u5206\u652f<\/span>
\ngit<\/span> push -u<\/span> origin feature\/login<\/p>\n

7.5 \u62c9\u53d6\u4e0e\u83b7\u53d6<\/h4>\n

# \u83b7\u53d6\u8fdc\u7a0b\u66f4\u65b0（\u4e0d\u5408\u5e76）<\/span>
\ngit<\/span> fetch origin<\/p>\n

# \u83b7\u53d6\u6240\u6709\u8fdc\u7a0b\u4ed3\u5e93\u7684\u66f4\u65b0<\/span>
\ngit<\/span> fetch –all<\/span><\/p>\n

# \u83b7\u53d6\u8fdc\u7a0b\u5206\u652f\u5e76\u521b\u5efa\u5bf9\u5e94\u7684\u672c\u5730\u5206\u652f<\/span>
\ngit<\/span> fetch origin feature\/login:feature\/login<\/p>\n

# \u62c9\u53d6\u8fdc\u7a0b\u66f4\u65b0\u5e76\u5408\u5e76（= fetch + merge）<\/span>
\ngit<\/span> pull origin main<\/p>\n

# \u62c9\u53d6\u5e76\u53d8\u57fa（= fetch + rebase）<\/span>
\ngit<\/span> pull –rebase<\/span> origin main<\/p>\n

# \u8bbe\u7f6e\u9ed8\u8ba4\u62c9\u53d6\u884c\u4e3a\u4e3a\u53d8\u57fa<\/span>
\ngit<\/span> config –global<\/span> pull.rebase true<\/span><\/p>\n

# \u62c9\u53d6\u5e76\u81ea\u52a8\u50a8\u85cf\u672c\u5730\u4fee\u6539<\/span>
\ngit<\/span> pull –autostash<\/span><\/p>\n

# \u83b7\u53d6\u5e76\u4fee\u526a\u5df2\u5220\u9664\u7684\u8fdc\u7a0b\u5206\u652f\u5f15\u7528<\/span>
\ngit<\/span> fetch –prune<\/span>
\ngit<\/span> fetch -p<\/span> # \u7b80\u5199<\/span><\/p>\n

7.6 \u8ddf\u8e2a\u8fdc\u7a0b\u5206\u652f<\/h4>\n

# \u67e5\u770b\u672c\u5730\u5206\u652f\u8ddf\u8e2a\u7684\u8fdc\u7a0b\u5206\u652f<\/span>
\ngit<\/span> branch -vv<\/span><\/p>\n

# \u8bbe\u7f6e\u672c\u5730\u5206\u652f\u8ddf\u8e2a\u8fdc\u7a0b\u5206\u652f<\/span>
\ngit<\/span> branch –set-upstream-to=<\/span>origin\/main main<\/p>\n

# \u7b80\u5199<\/span>
\ngit<\/span> branch -u<\/span> origin\/main main<\/p>\n

# \u53d6\u6d88\u8ddf\u8e2a<\/span>
\ngit<\/span> branch –unset-upstream<\/p>\n

# \u521b\u5efa\u672c\u5730\u5206\u652f\u5e76\u8ddf\u8e2a\u8fdc\u7a0b\u5206\u652f<\/span>
\ngit<\/span> checkout –track<\/span> origin\/feature\/login
\n# \u7b49\u540c\u4e8e<\/span>
\ngit<\/span> checkout -b<\/span> feature\/login origin\/feature\/login<\/p>\n

7.7 \u591a\u8fdc\u7a0b\u4ed3\u5e93\u64cd\u4f5c<\/h4>\n

# \u5178\u578b\u573a\u666f：fork \u540e\u540c\u6b65\u4e0a\u6e38\u4ed3\u5e93<\/span><\/p>\n

# 1. \u6dfb\u52a0\u4e0a\u6e38\u4ed3\u5e93<\/span>
\ngit<\/span> remote add<\/span> upstream https:\/\/github.com\/original\/repo.git<\/p>\n

# 2. \u83b7\u53d6\u4e0a\u6e38\u66f4\u65b0<\/span>
\ngit<\/span> fetch upstream<\/p>\n

# 3. \u5408\u5e76\u4e0a\u6e38\u7684 main \u5206\u652f<\/span>
\ngit<\/span> checkout main
\ngit<\/span> merge upstream\/main<\/p>\n

# 4. \u63a8\u9001\u5230\u81ea\u5df1\u7684 fork<\/span>
\ngit<\/span> push origin main<\/p>\n

# \u67e5\u770b\u6240\u6709\u8fdc\u7a0b\u4ed3\u5e93<\/span>
\ngit<\/span> remote -v<\/span><\/p>\n

# \u4ece\u6307\u5b9a\u8fdc\u7a0b\u4ed3\u5e93\u62c9\u53d6<\/span>
\ngit<\/span> pull upstream main<\/p>\n

\n

\u516b\u3001\u6807\u7b7e\u7ba1\u7406<\/h3>\n

8.1 \u67e5\u770b\u6807\u7b7e<\/h4>\n

# \u67e5\u770b\u6240\u6709\u6807\u7b7e<\/span>
\ngit<\/span> tag<\/p>\n

# \u641c\u7d22\u7279\u5b9a\u6a21\u5f0f\u7684\u6807\u7b7e<\/span>
\ngit<\/span> tag -l<\/span> "v1.*"<\/span><\/p>\n

# \u67e5\u770b\u6807\u7b7e\u53ca\u5176\u63d0\u4ea4\u4fe1\u606f<\/span>
\ngit<\/span> tag -n<\/span><\/p>\n

# \u67e5\u770b\u6807\u7b7e\u8be6\u60c5（\u6307\u5411\u7684\u63d0\u4ea4\u3001\u521b\u5efa\u65f6\u95f4\u7b49）<\/span>
\ngit<\/span> show v1.0.0<\/p>\n

8.2 \u521b\u5efa\u6807\u7b7e<\/h4>\n

# \u521b\u5efa\u8f7b\u91cf\u6807\u7b7e（lightweight tag，\u53ea\u662f\u4e00\u4e2a\u6307\u9488）<\/span>
\ngit<\/span> tag v1.0.0<\/p>\n

# \u521b\u5efa\u9644\u6ce8\u6807\u7b7e（annotated tag，\u5305\u542b\u6807\u7b7e\u4fe1\u606f，\u63a8\u8350）<\/span>
\ngit<\/span> tag -a<\/span> v1.0.0 -m<\/span> "\u7248\u672c 1.0.0 \u53d1\u5e03"<\/span><\/p>\n

# \u5bf9\u6307\u5b9a\u63d0\u4ea4\u6253\u6807\u7b7e<\/span>
\ngit<\/span> tag -a<\/span> v1.0.0 abc1234 -m<\/span> "\u7248\u672c 1.0.0"<\/span><\/p>\n

# \u5bf9\u4e0a\u4e00\u4e2a\u63d0\u4ea4\u6253\u6807\u7b7e<\/span>
\ngit<\/span> tag -a<\/span> v1.0.0 HEAD~1 -m<\/span> "\u7248\u672c 1.0.0"<\/span><\/p>\n

# \u521b\u5efa\u7b7e\u540d\u6807\u7b7e（GPG \u7b7e\u540d）<\/span>
\ngit<\/span> tag -s<\/span> v1.0.0 -m<\/span> "\u7b7e\u540d\u7684\u6807\u7b7e"<\/span><\/p>\n

8.3 \u64cd\u4f5c\u6807\u7b7e<\/h4>\n

# \u5220\u9664\u672c\u5730\u6807\u7b7e<\/span>
\ngit<\/span> tag -d<\/span> v1.0.0<\/p>\n

# \u5220\u9664\u8fdc\u7a0b\u6807\u7b7e<\/span>
\ngit<\/span> push origin –delete<\/span> v1.0.0
\n# \u6216<\/span>
\ngit<\/span> push origin :refs\/tags\/v1.0.0<\/p>\n

# \u63a8\u9001\u5355\u4e2a\u6807\u7b7e\u5230\u8fdc\u7a0b<\/span>
\ngit<\/span> push origin v1.0.0<\/p>\n

# \u63a8\u9001\u6240\u6709\u672c\u5730\u6807\u7b7e\u5230\u8fdc\u7a0b<\/span>
\ngit<\/span> push origin –tags<\/span><\/p>\n

# \u91cd\u547d\u540d\u6807\u7b7e（\u5148\u5220\u9664\u540e\u521b\u5efa）<\/span>
\ngit<\/span> tag -d<\/span> v1.0.0
\ngit<\/span> tag -a<\/span> v1.0.1 -m<\/span> "\u539f\u6765\u53eb v1.0.0，\u5df2\u91cd\u547d\u540d"<\/span>
\ngit<\/span> push origin v1.0.1<\/p>\n

# \u68c0\u51fa\u6807\u7b7e（\u8fdb\u5165 detached HEAD \u72b6\u6001）<\/span>
\ngit<\/span> checkout v1.0.0<\/p>\n

# \u57fa\u4e8e\u6807\u7b7e\u521b\u5efa\u5206\u652f<\/span>
\ngit<\/span> checkout -b<\/span> hotfix\/v1.0.1 v1.0.0<\/p>\n

\n

\u4e5d\u3001\u50a8\u85cf（Stash）<\/h3>\n

9.1 \u57fa\u672c\u50a8\u85cf\u64cd\u4f5c<\/h4>\n

# \u50a8\u85cf\u5f53\u524d\u4fee\u6539（\u5df2\u8ddf\u8e2a\u6587\u4ef6）<\/span>
\ngit<\/span> stash<\/p>\n

# \u50a8\u85cf\u5e76\u6dfb\u52a0\u63cf\u8ff0\u4fe1\u606f<\/span>
\ngit<\/span> stash push -m<\/span> "\u6b63\u5728\u5f00\u53d1\u7684\u529f\u80fd，\u9700\u8981\u4e34\u65f6\u5207\u6362\u5206\u652f"<\/span><\/p>\n

# \u50a8\u85cf\u5305\u62ec\u672a\u8ddf\u8e2a\u7684\u65b0\u6587\u4ef6<\/span>
\ngit<\/span> stash -u<\/span>
\ngit<\/span> stash –include-untracked<\/p>\n

# \u50a8\u85cf\u5305\u62ec\u5ffd\u7565\u7684\u6587\u4ef6<\/span>
\ngit<\/span> stash -a<\/span>
\ngit<\/span> stash –all<\/span><\/p>\n

# \u53ea\u50a8\u85cf\u6307\u5b9a\u6587\u4ef6<\/span>
\ngit<\/span> stash push -m<\/span> "\u53ea\u50a8\u85cf\u8fd9\u4e2a\u6587\u4ef6"<\/span> — filename.txt<\/p>\n

# \u53ea\u50a8\u85cf\u6307\u5b9a\u76ee\u5f55\u7684\u6587\u4ef6<\/span>
\ngit<\/span> stash push -m<\/span> "\u53ea\u50a8\u85cf src \u76ee\u5f55"<\/span> — src\/<\/p>\n

# \u4ea4\u4e92\u5f0f\u9009\u62e9\u8981\u50a8\u85cf\u7684\u5185\u5bb9<\/span>
\ngit<\/span> stash push -p<\/span><\/p>\n

9.2 \u67e5\u770b\u50a8\u85cf<\/h4>\n

# \u67e5\u770b\u50a8\u85cf\u5217\u8868<\/span>
\ngit<\/span> stash list<\/p>\n

# \u67e5\u770b\u50a8\u85cf\u7684\u4fee\u6539\u5185\u5bb9<\/span>
\ngit<\/span> stash show # \u6700\u65b0\u50a8\u85cf\u7684\u7edf\u8ba1<\/span>
\ngit<\/span> stash show -p<\/span> # \u6700\u65b0\u50a8\u85cf\u7684\u5b8c\u6574\u5dee\u5f02<\/span>
\ngit<\/span> stash show stash@{<\/span>0<\/span>}<\/span> # \u6307\u5b9a\u50a8\u85cf\u7684\u7edf\u8ba1<\/span>
\ngit<\/span> stash show -p<\/span> stash@{<\/span>2<\/span>}<\/span> # \u6307\u5b9a\u50a8\u85cf\u7684\u5b8c\u6574\u5dee\u5f02<\/span><\/p>\n

# \u67e5\u770b\u50a8\u85cf\u7684\u5185\u5bb9\u6982\u8981<\/span>
\ngit<\/span> stash list –stat<\/span><\/p>\n

9.3 \u6062\u590d\u50a8\u85cf<\/h4>\n

# \u6062\u590d\u6700\u65b0\u50a8\u85cf\u5e76\u5220\u9664（\u5e94\u7528\u5e76\u79fb\u9664）<\/span>
\ngit<\/span> stash pop<\/p>\n

# \u6062\u590d\u6307\u5b9a\u50a8\u85cf\u5e76\u5220\u9664<\/span>
\ngit<\/span> stash pop stash@{<\/span>2<\/span>}<\/span><\/p>\n

# \u6062\u590d\u6700\u65b0\u50a8\u85cf\u4f46\u4e0d\u5220\u9664（\u53ef\u4ee5\u591a\u6b21\u5e94\u7528）<\/span>
\ngit<\/span> stash apply<\/p>\n

# \u6062\u590d\u6307\u5b9a\u50a8\u85cf\u4f46\u4e0d\u5220\u9664<\/span>
\ngit<\/span> stash apply stash@{<\/span>2<\/span>}<\/span><\/p>\n

# \u4ece\u50a8\u85cf\u521b\u5efa\u65b0\u5206\u652f<\/span>
\ngit<\/span> stash branch new-branch-name<\/p>\n

# \u4ece\u6307\u5b9a\u50a8\u85cf\u521b\u5efa\u65b0\u5206\u652f<\/span>
\ngit<\/span> stash branch new-branch-name stash@{<\/span>2<\/span>}<\/span><\/p>\n

9.4 \u5220\u9664\u50a8\u85cf<\/h4>\n

# \u5220\u9664\u6700\u65b0\u50a8\u85cf<\/span>
\ngit<\/span> stash drop<\/p>\n

# \u5220\u9664\u6307\u5b9a\u50a8\u85cf<\/span>
\ngit<\/span> stash drop stash@{<\/span>2<\/span>}<\/span><\/p>\n

# \u6e05\u9664\u6240\u6709\u50a8\u85cf<\/span>
\ngit<\/span> stash clear<\/span><\/p>\n

9.5 \u50a8\u85cf\u4f7f\u7528\u573a\u666f<\/h4>\n

# \u573a\u666f：\u6b63\u5728\u5f00\u53d1 feature，\u7a81\u7136\u9700\u8981\u4fee bug<\/span><\/p>\n

# 1. \u50a8\u85cf\u5f53\u524d\u5de5\u4f5c<\/span>
\ngit<\/span> stash push -m<\/span> "feature: \u7528\u6237\u5934\u50cf\u4e0a\u4f20\u529f\u80fd\u5f00\u53d1\u4e2d"<\/span><\/p>\n

# 2. \u5207\u6362\u5230 bugfix \u5206\u652f<\/span>
\ngit<\/span> checkout -b<\/span> hotfix\/login-bug main<\/p>\n

# 3. \u4fee\u590d bug \u5e76\u63d0\u4ea4<\/span>
\ngit<\/span> add<\/span> .<\/span>
\ngit<\/span> commit -m<\/span> "fix: \u4fee\u590d\u767b\u5f55\u9a8c\u8bc1\u6f0f\u6d1e"<\/span><\/p>\n

# 4. \u5207\u6362\u56de feature \u5206\u652f<\/span>
\ngit<\/span> checkout feature\/user-avatar<\/p>\n

# 5. \u6062\u590d\u4e4b\u524d\u7684\u5de5\u4f5c<\/span>
\ngit<\/span> stash pop<\/p>\n

\n

\u5341\u3001\u5408\u5e76\u4e0e\u53d8\u57fa<\/h3>\n

10.1 \u5408\u5e76（Merge）<\/h4>\n

# \u5c06\u6307\u5b9a\u5206\u652f\u5408\u5e76\u5230\u5f53\u524d\u5206\u652f<\/span>
\ngit<\/span> merge feature\/login<\/p>\n

# \u5408\u5e76\u5e76\u521b\u5efa\u5408\u5e76\u63d0\u4ea4（\u5373\u4f7f\u53ef\u4ee5\u5feb\u8fdb\u5408\u5e76）<\/span>
\ngit<\/span> merge –no-ff feature\/login<\/p>\n

# \u53ea\u5141\u8bb8\u5feb\u8fdb\u5408\u5e76（\u5982\u679c\u4e0d\u80fd\u5feb\u8fdb\u5219\u5931\u8d25）<\/span>
\ngit<\/span> merge –ff-only feature\/login<\/p>\n

# \u5408\u5e76\u4f46\u4e0d\u81ea\u52a8\u63d0\u4ea4（\u53ef\u4ee5\u7ee7\u7eed\u4fee\u6539\u540e\u518d\u63d0\u4ea4）<\/span>
\ngit<\/span> merge –no-commit feature\/login<\/p>\n

# \u5408\u5e76\u540e\u653e\u5f03\u5408\u5e76<\/span>
\ngit<\/span> merge –abort<\/span><\/p>\n

# \u538b\u7f29\u5408\u5e76（\u5c06\u6307\u5b9a\u5206\u652f\u7684\u6240\u6709\u63d0\u4ea4\u538b\u7f29\u4e3a\u4e00\u4e2a\u63d0\u4ea4）<\/span>
\ngit<\/span> merge –squash<\/span> feature\/login
\ngit<\/span> commit -m<\/span> "feat: \u6dfb\u52a0\u767b\u5f55\u529f\u80fd（\u538b\u7f29\u5408\u5e76）"<\/span><\/p>\n

10.2 \u53d8\u57fa（Rebase）<\/h4>\n

# \u5c06\u5f53\u524d\u5206\u652f\u53d8\u57fa\u5230\u6307\u5b9a\u5206\u652f（\u5c06\u5f53\u524d\u5206\u652f\u7684\u63d0\u4ea4"\u79fb\u52a8"\u5230\u6307\u5b9a\u5206\u652f\u4e4b\u540e）<\/span>
\ngit<\/span> rebase main<\/p>\n

# \u53d8\u57fa\u5230\u6307\u5b9a\u63d0\u4ea4<\/span>
\ngit<\/span> rebase abc1234<\/p>\n

# \u4ea4\u4e92\u5f0f\u53d8\u57fa（\u4fee\u6539\u3001\u5408\u5e76\u3001\u91cd\u65b0\u6392\u5e8f\u63d0\u4ea4）<\/span>
\ngit<\/span> rebase -i<\/span> HEAD~3 # \u5bf9\u6700\u8fd1 3 \u6b21\u63d0\u4ea4\u8fdb\u884c\u4ea4\u4e92\u5f0f\u53d8\u57fa<\/span><\/p>\n

# \u4ea4\u4e92\u5f0f\u53d8\u57fa\u7684\u9009\u9879\u8bf4\u660e：<\/span>
\n# pick – \u4f7f\u7528\u8be5\u63d0\u4ea4<\/span>
\n# reword – \u4f7f\u7528\u8be5\u63d0\u4ea4，\u4f46\u4fee\u6539\u63d0\u4ea4\u4fe1\u606f<\/span>
\n# edit – \u4f7f\u7528\u8be5\u63d0\u4ea4，\u4f46\u6682\u505c\u4ee5\u4fbf\u4fee\u6539<\/span>
\n# squash – \u4f7f\u7528\u8be5\u63d0\u4ea4，\u4f46\u5408\u5e76\u5230\u524d\u4e00\u4e2a\u63d0\u4ea4<\/span>
\n# fixup – \u540c squash，\u4f46\u4e22\u5f03\u8be5\u63d0\u4ea4\u7684\u4fe1\u606f<\/span>
\n# drop – \u5220\u9664\u8be5\u63d0\u4ea4<\/span><\/p>\n

# \u53d8\u57fa\u8fc7\u7a0b\u4e2d\u9047\u5230\u51b2\u7a81\u65f6<\/span>
\ngit<\/span> rebase –continue<\/span> # \u89e3\u51b3\u51b2\u7a81\u540e\u7ee7\u7eed\u53d8\u57fa<\/span>
\ngit<\/span> rebase –skip<\/span> # \u8df3\u8fc7\u5f53\u524d\u51b2\u7a81\u7684\u63d0\u4ea4<\/span>
\ngit<\/span> rebase –abort<\/span> # \u653e\u5f03\u53d8\u57fa，\u56de\u5230\u53d8\u57fa\u524d\u7684\u72b6\u6001<\/span><\/p>\n

# \u53d8\u57fa\u5230\u6307\u5b9a\u5206\u652f\u7684\u7279\u5b9a\u63d0\u4ea4<\/span>
\ngit<\/span> rebase –onto<\/span> main abc1234 feature\/login
\n# \u5c06 feature\/login \u4e2d abc1234 \u4e4b\u540e\u7684\u63d0\u4ea4\u53d8\u57fa\u5230 main \u4e0a<\/span><\/p>\n

10.3 \u5408\u5e76 vs \u53d8\u57fa<\/h4>\n

# \u5408\u5e76（Merge）：
\n# – \u4fdd\u7559\u5b8c\u6574\u7684\u5206\u652f\u5386\u53f2
\n# – \u521b\u5efa\u5408\u5e76\u63d0\u4ea4
\n# – \u5386\u53f2\u56fe\u6709\u5206\u53c9
\n# – \u5b89\u5168，\u4e0d\u4fee\u6539\u5df2\u6709\u63d0\u4ea4
\n# – \u9002\u5408\u591a\u4eba\u534f\u4f5c\u7684\u516c\u5171\u5206\u652f<\/p>\n

# \u53d8\u57fa（Rebase）：
\n# – \u521b\u5efa\u7ebf\u6027\u5386\u53f2，\u66f4\u6574\u6d01
\n# – \u4e0d\u521b\u5efa\u5408\u5e76\u63d0\u4ea4
\n# – "\u79fb\u52a8"\u63d0\u4ea4\u5230\u76ee\u6807\u5206\u652f\u4e4b\u540e
\n# – \u4fee\u6539\u63d0\u4ea4\u54c8\u5e0c（\u5b9e\u9645\u4e0a\u662f\u521b\u5efa\u65b0\u63d0\u4ea4）
\n# – \u9002\u5408\u4e2a\u4eba\u529f\u80fd\u5206\u652f，\u4fdd\u6301\u5386\u53f2\u6e05\u6670
\n# – \u6ce8\u610f：\u4e0d\u8981\u5bf9\u5df2\u63a8\u9001\u5230\u8fdc\u7a0b\u7684\u516c\u5171\u5206\u652f\u8fdb\u884c\u53d8\u57fa！<\/p>\n

10.4 \u5408\u5e76\u4e0e\u53d8\u57fa\u7684\u63a8\u8350\u5de5\u4f5c\u6d41<\/h4>\n

# \u65b9\u5f0f\u4e00：\u529f\u80fd\u5206\u652f\u4f7f\u7528\u53d8\u57fa\u4fdd\u6301\u6700\u65b0<\/span>
\ngit<\/span> checkout feature\/login
\ngit<\/span> rebase main # \u5c06\u529f\u80fd\u5206\u652f\u53d8\u57fa\u5230\u6700\u65b0\u7684 main<\/span>
\ngit<\/span> checkout main
\ngit<\/span> merge –no-ff feature\/login # \u5408\u5e76\u529f\u80fd\u5206\u652f\u5230 main<\/span><\/p>\n

# \u65b9\u5f0f\u4e8c：\u4f7f\u7528 –no-ff \u5408\u5e76（\u4fdd\u7559\u5206\u652f\u4fe1\u606f）<\/span>
\ngit<\/span> checkout main
\ngit<\/span> merge –no-ff feature\/login
\n# \u8fd9\u4f1a\u521b\u5efa\u4e00\u4e2a\u5408\u5e76\u63d0\u4ea4，\u4fdd\u7559\u529f\u80fd\u5206\u652f\u7684\u5b8c\u6574\u5386\u53f2<\/span><\/p>\n

\n

\u5341\u4e00\u3001\u51b2\u7a81\u89e3\u51b3<\/h3>\n

11.1 \u51b2\u7a81\u6807\u8bb0\u8bf4\u660e<\/h4>\n

<<<<<<< HEAD
\n\u8fd9\u91cc\u662f\u5f53\u524d\u5206\u652f\u7684\u5185\u5bb9
\n=======
\n\u8fd9\u91cc\u662f\u88ab\u5408\u5e76\u5206\u652f\u7684\u5185\u5bb9
\n>>>>>>> feature\/login<\/p>\n

# \u8bf4\u660e：
\n# <<<<<<< HEAD \u5230 ======= \u4e4b\u95f4\u662f\u5f53\u524d\u5206\u652f\u7684\u5185\u5bb9
\n# ======= \u5230 >>>>>>> feature\/login \u4e4b\u95f4\u662f\u88ab\u5408\u5e76\u5206\u652f\u7684\u5185\u5bb9<\/p>\n

11.2 \u89e3\u51b3\u51b2\u7a81<\/h4>\n

# 1. \u5408\u5e76\u6216\u53d8\u57fa\u65f6\u9047\u5230\u51b2\u7a81<\/span>
\ngit<\/span> merge feature\/login
\n# \u8f93\u51fa：CONFLICT (content): Merge conflict in filename.txt<\/span><\/p>\n

# 2. \u67e5\u770b\u51b2\u7a81\u6587\u4ef6<\/span>
\ngit<\/span> status # \u4f1a\u663e\u793a "both modified: filename.txt"<\/span><\/p>\n

# 3. \u624b\u52a8\u7f16\u8f91\u51b2\u7a81\u6587\u4ef6，\u5220\u9664\u51b2\u7a81\u6807\u8bb0，\u4fdd\u7559\u6b63\u786e\u5185\u5bb9<\/span><\/p>\n

# 4. \u4f7f\u7528\u5de5\u5177\u89e3\u51b3\u51b2\u7a81<\/span>
\ngit<\/span> mergetool<\/p>\n

# 5. \u6807\u8bb0\u51b2\u7a81\u5df2\u89e3\u51b3<\/span>
\ngit<\/span> add<\/span> filename.txt<\/p>\n

# 6. \u7ee7\u7eed\u5408\u5e76\u6216\u53d8\u57fa<\/span>
\ngit<\/span> commit # \u5408\u5e76\u65f6<\/span>
\ngit<\/span> rebase –continue<\/span> # \u53d8\u57fa\u65f6<\/span><\/p>\n

# \u6216\u8005\u653e\u5f03\u5408\u5e76\/\u53d8\u57fa<\/span>
\ngit<\/span> merge –abort<\/span> # \u653e\u5f03\u5408\u5e76<\/span>
\ngit<\/span> rebase –abort<\/span> # \u653e\u5f03\u53d8\u57fa<\/span><\/p>\n

11.3 \u51b2\u7a81\u89e3\u51b3\u7b56\u7565<\/h4>\n

# \u4f7f\u7528\u5f53\u524d\u5206\u652f\u7684\u7248\u672c<\/span>
\ngit<\/span> checkout –ours<\/span> filename.txt<\/p>\n

# \u4f7f\u7528\u88ab\u5408\u5e76\u5206\u652f\u7684\u7248\u672c<\/span>
\ngit<\/span> checkout –theirs<\/span> filename.txt<\/p>\n

# \u4f7f\u7528\u5f53\u524d\u5206\u652f\u7684\u7248\u672c（\u53d8\u57fa\u65f6\u8bed\u4e49\u76f8\u53cd）<\/span>
\ngit<\/span> checkout –ours<\/span> filename.txt # \u53d8\u57fa\u65f6：ours = \u76ee\u6807\u5206\u652f<\/span>
\ngit<\/span> checkout –theirs<\/span> filename.txt # \u53d8\u57fa\u65f6：theirs = \u5f53\u524d\u5206\u652f<\/span><\/p>\n

# \u5220\u9664\u51b2\u7a81\u6587\u4ef6<\/span>
\ngit<\/span> rm<\/span> filename.txt<\/p>\n

# \u6807\u8bb0\u4e3a\u5df2\u89e3\u51b3（\u4e0d\u4fee\u6539\u6587\u4ef6，\u4f7f\u7528\u5f53\u524d\u7248\u672c）<\/span>
\ngit<\/span> add<\/span> filename.txt<\/p>\n

\n

\u5341\u4e8c\u3001Git \u9ad8\u7ea7\u6280\u5de7<\/h3>\n

12.1 Cherry-pick（\u6458\u53d6\u63d0\u4ea4）<\/h4>\n

# \u5c06\u6307\u5b9a\u63d0\u4ea4\u5e94\u7528\u5230\u5f53\u524d\u5206\u652f<\/span>
\ngit<\/span> cherry-pick abc1234<\/p>\n

# \u6458\u53d6\u591a\u4e2a\u63d0\u4ea4<\/span>
\ngit<\/span> cherry-pick abc1234 def5678<\/p>\n

# \u6458\u53d6\u4e00\u4e2a\u8303\u56f4\u7684\u63d0\u4ea4（\u4e0d\u5305\u542b\u8d77\u59cb\u63d0\u4ea4）<\/span>
\ngit<\/span> cherry-pick abc1234..<\/span>def5678<\/p>\n

# \u6458\u53d6\u4e00\u4e2a\u8303\u56f4\u7684\u63d0\u4ea4（\u5305\u542b\u8d77\u59cb\u63d0\u4ea4）<\/span>
\ngit<\/span> cherry-pick abc1234^..<\/span>def5678<\/p>\n

# \u6458\u53d6\u4f46\u4e0d\u81ea\u52a8\u63d0\u4ea4<\/span>
\ngit<\/span> cherry-pick –no-commit abc1234<\/p>\n

# \u6458\u53d6\u5408\u5e76\u63d0\u4ea4（\u9700\u8981\u6307\u5b9a\u4fdd\u7559\u54ea\u4e2a\u7236\u63d0\u4ea4）<\/span>
\ngit<\/span> cherry-pick -m<\/span> 1<\/span> <<\/span>merge-commit-hash><\/span><\/p>\n

# \u6458\u53d6\u9047\u5230\u51b2\u7a81\u65f6<\/span>
\ngit<\/span> cherry-pick –continue<\/span> # \u89e3\u51b3\u51b2\u7a81\u540e\u7ee7\u7eed<\/span>
\ngit<\/span> cherry-pick –skip<\/span> # \u8df3\u8fc7\u5f53\u524d\u63d0\u4ea4<\/span>
\ngit<\/span> cherry-pick –abort<\/span> # \u653e\u5f03\u6574\u4e2a\u64cd\u4f5c<\/span><\/p>\n

12.2 \u4e8c\u5206\u67e5\u627e（Bisect）<\/h4>\n

# \u5f00\u59cb\u4e8c\u5206\u67e5\u627e（\u7528\u4e8e\u5b9a\u4f4d\u5f15\u5165 bug \u7684\u63d0\u4ea4）<\/span>
\ngit<\/span> bisect start<\/p>\n

# \u6807\u8bb0\u5f53\u524d\u7248\u672c\u4e3a\u6709 bug<\/span>
\ngit<\/span> bisect bad<\/p>\n

# \u6807\u8bb0\u67d0\u4e2a\u7248\u672c\u4e3a\u65e0 bug<\/span>
\ngit<\/span> bisect good v1.0.0<\/p>\n

# Git \u4f1a\u81ea\u52a8 checkout \u5230\u4e2d\u95f4\u7684\u63d0\u4ea4，\u4f60\u6d4b\u8bd5\u540e\u7ee7\u7eed\u6807\u8bb0<\/span>
\ngit<\/span> bisect good # \u5f53\u524d\u7248\u672c\u6ca1\u6709 bug<\/span>
\ngit<\/span> bisect bad # \u5f53\u524d\u7248\u672c\u6709 bug<\/span><\/p>\n

# \u81ea\u52a8\u4e8c\u5206\u67e5\u627e（\u4f7f\u7528\u811a\u672c\u81ea\u52a8\u6d4b\u8bd5）<\/span>
\ngit<\/span> bisect start HEAD v1.0.0
\ngit<\/span> bisect run .\/test-script.sh
\n# \u811a\u672c\u8fd4\u56de 0 \u8868\u793a good，\u975e 0 \u8868\u793a bad<\/span><\/p>\n

# \u7ed3\u675f\u4e8c\u5206\u67e5\u627e<\/span>
\ngit<\/span> bisect reset<\/p>\n

# \u67e5\u770b\u5f53\u524d\u4e8c\u5206\u67e5\u627e\u72b6\u6001<\/span>
\ngit<\/span> bisect log<\/p>\n

# \u8df3\u8fc7\u67d0\u4e2a\u65e0\u6cd5\u6d4b\u8bd5\u7684\u63d0\u4ea4<\/span>
\ngit<\/span> bisect skip<\/p>\n

12.3 Reflog（\u5f15\u7528\u65e5\u5fd7）<\/h4>\n

# \u67e5\u770b\u6240\u6709\u64cd\u4f5c\u5386\u53f2（\u5305\u62ec\u5df2\u5220\u9664\u7684\u63d0\u4ea4）<\/span>
\ngit<\/span> reflog<\/p>\n

# \u67e5\u770b\u6307\u5b9a\u5f15\u7528\u7684\u64cd\u4f5c\u5386\u53f2<\/span>
\ngit<\/span> reflog show main<\/p>\n

# \u67e5\u770b HEAD \u7684\u64cd\u4f5c\u5386\u53f2<\/span>
\ngit<\/span> reflog show HEAD<\/p>\n

# \u6062\u590d\u5df2\u5220\u9664\u7684\u63d0\u4ea4<\/span>
\ngit<\/span> reflog
\n# \u627e\u5230\u76ee\u6807\u63d0\u4ea4\u7684\u54c8\u5e0c<\/span>
\ngit<\/span> checkout abc1234
\n# \u6216\u521b\u5efa\u65b0\u5206\u652f<\/span>
\ngit<\/span> branch recover abc1234<\/p>\n

# \u6062\u590d\u5df2\u91cd\u7f6e\u7684\u5206\u652f<\/span>
\ngit<\/span> reflog main
\n# \u627e\u5230\u91cd\u7f6e\u524d\u7684\u54c8\u5e0c<\/span>
\ngit<\/span> reset –hard<\/span> abc1234<\/p>\n

12.4 \u91cd\u5199\u5386\u53f2<\/h4>\n

# \u4fee\u6539\u6700\u8fd1\u4e00\u6b21\u63d0\u4ea4<\/span>
\ngit<\/span> commit –amend<\/span><\/p>\n

# \u4fee\u6539\u6700\u8fd1\u4e00\u6b21\u63d0\u4ea4\u7684\u4fe1\u606f<\/span>
\ngit<\/span> commit –amend<\/span> -m<\/span> "\u65b0\u7684\u63d0\u4ea4\u4fe1\u606f"<\/span><\/p>\n

# \u4ea4\u4e92\u5f0f\u53d8\u57fa（\u91cd\u5199\u6700\u8fd1 N \u6b21\u63d0\u4ea4）<\/span>
\ngit<\/span> rebase -i<\/span> HEAD~N<\/p>\n

# \u4f7f\u7528 filter-branch \u91cd\u5199\u6240\u6709\u63d0\u4ea4\u7684\u4f5c\u8005\u4fe1\u606f<\/span>
\ngit<\/span> filter-branch –env-filter '
\n if [ "$GIT_AUTHOR_EMAIL" = "old@email.com" ]; then
\n export GIT_AUTHOR_EMAIL="new@email.com"
\n fi
\n'<\/span> — –all<\/span><\/p>\n

# \u63a8\u8350\u4f7f\u7528 git-filter-repo（\u66f4\u5b89\u5168\u3001\u66f4\u5feb\u901f）<\/span>
\n# \u5b89\u88c5: pip install git-filter-repo<\/span>
\ngit<\/span> filter-repo –mailmap<\/span> mailmap.txt<\/p>\n

# \u4ece\u6240\u6709\u63d0\u4ea4\u4e2d\u5220\u9664\u67d0\u4e2a\u6587\u4ef6<\/span>
\ngit<\/span> filter-branch –force<\/span> –index-filter \\\\<\/span>
\n 'git rm –cached –ignore-unmatch path\/to\/file'<\/span> \\\\<\/span>
\n –prune-empty — –all<\/span><\/p>\n

12.5 \u5de5\u4f5c\u6811（Worktree）<\/h4>\n

# \u6dfb\u52a0\u65b0\u5de5\u4f5c\u6811（\u53ef\u4ee5\u5728\u4e0d\u5207\u6362\u5206\u652f\u7684\u60c5\u51b5\u4e0b\u540c\u65f6\u5728\u591a\u4e2a\u5206\u652f\u4e0a\u5de5\u4f5c）<\/span>
\ngit<\/span> worktree add<\/span> ..<\/span>\/hotfix-branch hotfix\/v1.0.1<\/p>\n

# \u6dfb\u52a0\u65b0\u5de5\u4f5c\u6811\u5e76\u521b\u5efa\u65b0\u5206\u652f<\/span>
\ngit<\/span> worktree add<\/span> -b<\/span> new-feature ..<\/span>\/feature-workspace<\/p>\n

# \u67e5\u770b\u6240\u6709\u5de5\u4f5c\u6811<\/span>
\ngit<\/span> worktree list<\/p>\n

# \u5220\u9664\u5de5\u4f5c\u6811<\/span>
\ngit<\/span> worktree remove ..<\/span>\/hotfix-branch<\/p>\n

# \u6e05\u7406\u5df2\u5220\u9664\u7684\u5de5\u4f5c\u6811\u5f15\u7528<\/span>
\ngit<\/span> worktree prune<\/p>\n

12.6 \u6e05\u7406<\/h4>\n

# \u9884\u89c8\u5c06\u88ab\u5220\u9664\u7684\u672a\u8ddf\u8e2a\u6587\u4ef6<\/span>
\ngit<\/span> clean -n<\/span><\/p>\n

# \u5220\u9664\u672a\u8ddf\u8e2a\u7684\u6587\u4ef6<\/span>
\ngit<\/span> clean -f<\/span><\/p>\n

# \u5220\u9664\u672a\u8ddf\u8e2a\u7684\u6587\u4ef6\u548c\u76ee\u5f55<\/span>
\ngit<\/span> clean -fd<\/span><\/p>\n

# \u5220\u9664\u672a\u8ddf\u8e2a\u548c\u88ab\u5ffd\u7565\u7684\u6587\u4ef6<\/span>
\ngit<\/span> clean -fdx<\/span><\/p>\n

# \u4ea4\u4e92\u5f0f\u6e05\u7406<\/span>
\ngit<\/span> clean -i<\/span><\/p>\n

12.7 \u5f52\u6863<\/h4>\n

# \u5c06\u4ed3\u5e93\u6253\u5305\u4e3a zip<\/span>
\ngit<\/span> archive –format<\/span>=<\/span>zip HEAD ><\/span> project.zip<\/p>\n

# \u5c06\u4ed3\u5e93\u6253\u5305\u4e3a tar.gz<\/span>
\ngit<\/span> archive –format<\/span>=<\/span>tar.gz HEAD ><\/span> project.tar.gz<\/p>\n

# \u53ea\u6253\u5305\u6307\u5b9a\u76ee\u5f55<\/span>
\ngit<\/span> archive –format<\/span>=<\/span>zip HEAD src\/ ><\/span> src.zip<\/p>\n

# \u6253\u5305\u6307\u5b9a\u6807\u7b7e\u6216\u5206\u652f<\/span>
\ngit<\/span> archive –format<\/span>=<\/span>zip v1.0.0 ><\/span> v1.0.0.zip<\/p>\n

\n

\u5341\u4e09\u3001Git \u5b50\u6a21\u5757<\/h3>\n

13.1 \u57fa\u672c\u64cd\u4f5c<\/h4>\n

# \u6dfb\u52a0\u5b50\u6a21\u5757<\/span>
\ngit<\/span> submodule add<\/span> https:\/\/github.com\/user\/library.git libs\/library<\/p>\n

# \u6dfb\u52a0\u5b50\u6a21\u5757\u5230\u6307\u5b9a\u76ee\u5f55<\/span>
\ngit<\/span> submodule add<\/span> https:\/\/github.com\/user\/library.git path\/to\/library<\/p>\n

# \u6dfb\u52a0\u6307\u5b9a\u5206\u652f\u7684\u5b50\u6a21\u5757<\/span>
\ngit<\/span> submodule add<\/span> -b<\/span> main https:\/\/github.com\/user\/library.git libs\/library<\/p>\n

# \u521d\u59cb\u5316\u5b50\u6a21\u5757（\u514b\u9686\u540e\u9996\u6b21\u4f7f\u7528）<\/span>
\ngit<\/span> submodule init<\/p>\n

# \u66f4\u65b0\u5b50\u6a21\u5757<\/span>
\ngit<\/span> submodule update<\/p>\n

# \u521d\u59cb\u5316\u5e76\u66f4\u65b0\u5b50\u6a21\u5757（\u5e38\u7528）<\/span>
\ngit<\/span> submodule update –init<\/span><\/p>\n

# \u9012\u5f52\u521d\u59cb\u5316\u548c\u66f4\u65b0\u6240\u6709\u5b50\u6a21\u5757（\u5305\u62ec\u5d4c\u5957\u5b50\u6a21\u5757）<\/span>
\ngit<\/span> submodule update –init<\/span> –recursive<\/span><\/p>\n

# \u514b\u9686\u5305\u542b\u5b50\u6a21\u5757\u7684\u4ed3\u5e93<\/span>
\ngit<\/span> clone –recursive<\/span> https:\/\/github.com\/user\/repo.git<\/p>\n

# \u514b\u9686\u540e\u521d\u59cb\u5316\u5b50\u6a21\u5757<\/span>
\ngit<\/span> clone https:\/\/github.com\/user\/repo.git
\ncd<\/span> repo
\ngit<\/span> submodule update –init<\/span> –recursive<\/span><\/p>\n

13.2 \u5b50\u6a21\u5757\u7ba1\u7406<\/h4>\n

# \u67e5\u770b\u5b50\u6a21\u5757\u72b6\u6001<\/span>
\ngit<\/span> submodule status<\/p>\n

# \u67e5\u770b\u5b50\u6a21\u5757\u7684\u4fee\u6539<\/span>
\ngit<\/span> diff<\/span> –submodule<\/span><\/p>\n

# \u8fdb\u5165\u5b50\u6a21\u5757\u76ee\u5f55\u5e76\u5207\u6362\u5230\u6307\u5b9a\u5206\u652f<\/span>
\ncd<\/span> libs\/library
\ngit<\/span> checkout main<\/p>\n

# \u66f4\u65b0\u5b50\u6a21\u5757\u5230\u6700\u65b0\u63d0\u4ea4<\/span>
\ngit<\/span> submodule update –remote<\/span><\/p>\n

# \u66f4\u65b0\u6307\u5b9a\u5b50\u6a21\u5757<\/span>
\ngit<\/span> submodule update –remote<\/span> libs\/library<\/p>\n

# \u5bf9\u6240\u6709\u5b50\u6a21\u5757\u6267\u884c\u547d\u4ee4<\/span>
\ngit<\/span> submodule foreach 'git pull origin main'<\/span><\/p>\n

# \u5bf9\u6240\u6709\u5b50\u6a21\u5757\u6267\u884c\u590d\u6742\u547d\u4ee4<\/span>
\ngit<\/span> submodule foreach '
\n git checkout main
\n git pull origin main
\n'<\/span><\/p>\n

# \u5220\u9664\u5b50\u6a21\u5757<\/span>
\ngit<\/span> submodule deinit libs\/library # \u53d6\u6d88\u6ce8\u518c<\/span>
\ngit<\/span> rm<\/span> libs\/library # \u4ece .gitmodules \u548c\u6682\u5b58\u533a\u5220\u9664<\/span>
\nrm<\/span> -rf<\/span> .git\/modules\/libs\/library # \u5220\u9664\u5b50\u6a21\u5757\u7684 git \u6570\u636e<\/span><\/p>\n

13.3 \u5b50\u6a21\u5757\u914d\u7f6e\u6587\u4ef6<\/h4>\n

# .gitmodules \u6587\u4ef6\u793a\u4f8b
\n[submodule "libs\/library"]
\n path = libs\/library # \u5b50\u6a21\u5757\u5728\u4e3b\u4ed3\u5e93\u4e2d\u7684\u8def\u5f84
\n url = https:\/\/github.com\/user\/library.git # \u5b50\u6a21\u5757\u7684\u8fdc\u7a0b\u5730\u5740
\n branch = main # \u8ddf\u8e2a\u7684\u5206\u652f（\u53ef\u9009）<\/p>\n

\n

\u5341\u56db\u3001Git Hooks（\u94a9\u5b50）<\/h3>\n

14.1 \u94a9\u5b50\u6982\u8ff0<\/h4>\n

# \u94a9\u5b50\u4f4d\u4e8e .git\/hooks\/ \u76ee\u5f55\u4e0b<\/span>
\n# \u94a9\u5b50\u662f\u53ef\u6267\u884c\u7684\u811a\u672c\u6587\u4ef6，\u5728\u7279\u5b9a Git \u64cd\u4f5c\u65f6\u81ea\u52a8\u6267\u884c<\/span><\/p>\n

# \u67e5\u770b\u6240\u6709\u53ef\u7528\u94a9\u5b50<\/span>
\nls<\/span> .git\/hooks\/<\/p>\n

14.2 \u5e38\u7528\u94a9\u5b50<\/h4>\n

# === \u5ba2\u6237\u7aef\u94a9\u5b50 ===<\/span><\/p>\n

# pre-commit – \u5728\u6267\u884c git commit \u4e4b\u524d\u8fd0\u884c<\/span>
\n# \u7528\u9014：\u4ee3\u7801\u68c0\u67e5\u3001\u683c\u5f0f\u5316\u3001\u6d4b\u8bd5\u7b49<\/span>
\n# \u8fd4\u56de\u975e 0 \u503c\u4f1a\u53d6\u6d88\u63d0\u4ea4<\/span><\/p>\n

# prepare-commit-msg – \u5728\u6253\u5f00\u7f16\u8f91\u5668\u4e4b\u524d\u8fd0\u884c<\/span>
\n# \u7528\u9014：\u81ea\u5b9a\u4e49\u9ed8\u8ba4\u63d0\u4ea4\u4fe1\u606f<\/span><\/p>\n

# commit-msg – \u5728\u63d0\u4ea4\u4fe1\u606f\u5199\u5165\u540e\u8fd0\u884c<\/span>
\n# \u7528\u9014：\u9a8c\u8bc1\u63d0\u4ea4\u4fe1\u606f\u683c\u5f0f<\/span><\/p>\n

# pre-push – \u5728\u6267\u884c git push \u4e4b\u524d\u8fd0\u884c<\/span>
\n# \u7528\u9014：\u8fd0\u884c\u6d4b\u8bd5\u3001\u68c0\u67e5\u4ee3\u7801\u7b49<\/span><\/p>\n

# === \u670d\u52a1\u7aef\u94a9\u5b50 ===<\/span><\/p>\n

# pre-receive – \u5728\u5904\u7406\u63a8\u9001\u4e4b\u524d\u8fd0\u884c<\/span>
\n# update – \u5728\u6bcf\u6b21\u63a8\u9001\u7684\u6bcf\u4e2a\u5206\u652f\u4e4b\u524d\u8fd0\u884c<\/span>
\n# post-receive – \u5728\u63a8\u9001\u5904\u7406\u5b8c\u6210\u540e\u8fd0\u884c<\/span><\/p>\n

14.3 \u94a9\u5b50\u793a\u4f8b<\/h4>\n

# .git\/hooks\/pre-commit \u793a\u4f8b（\u786e\u4fdd\u4ee3\u7801\u683c\u5f0f\u5316）<\/span>
\n#!\/bin\/sh<\/span>
\n# \u68c0\u67e5\u662f\u5426\u6709\u672a\u89e3\u51b3\u7684\u51b2\u7a81\u6807\u8bb0<\/span>
\nif<\/span> git<\/span> diff<\/span> –cached<\/span> –name-only |<\/span> xargs<\/span> grep<\/span> -l<\/span> '<<<<<<'<\/span> 2<\/span>><\/span>\/dev\/null;<\/span> then<\/span>
\n echo<\/span> "\u9519\u8bef：\u53d1\u73b0\u51b2\u7a81\u6807\u8bb0，\u8bf7\u5148\u89e3\u51b3\u51b2\u7a81"<\/span>
\n exit<\/span> 1<\/span>
\nfi<\/span><\/p>\n

# \u8fd0\u884c\u4ee3\u7801\u68c0\u67e5<\/span>
\nnpm<\/span> run lint
\nif<\/span> [<\/span> $?<\/span> -ne<\/span> 0<\/span> ]<\/span>;<\/span> then<\/span>
\n echo<\/span> "\u4ee3\u7801\u68c0\u67e5\u5931\u8d25，\u8bf7\u4fee\u590d\u540e\u91cd\u65b0\u63d0\u4ea4"<\/span>
\n exit<\/span> 1<\/span>
\nfi<\/span><\/p>\n

exit<\/span> 0<\/span><\/p>\n

# .git\/hooks\/commit-msg \u793a\u4f8b（\u9a8c\u8bc1\u63d0\u4ea4\u4fe1\u606f\u683c\u5f0f）<\/span>
\n#!\/bin\/sh<\/span>
\n# \u9a8c\u8bc1\u63d0\u4ea4\u4fe1\u606f\u662f\u5426\u7b26\u5408 Conventional Commits \u683c\u5f0f<\/span>
\ncommit_msg<\/span>=<\/span>$(<\/span>cat<\/span> "$1<\/span>"<\/span>)<\/span><\/span>
\nif<\/span> !<\/span> echo<\/span> "$commit_msg<\/span>"<\/span> |<\/span> grep<\/span> -qE<\/span> '^(feat|fix|docs|style|refactor|perf|test|chore|ci|revert)(\\\\(.+\\\\))?: .+'<\/span>;<\/span> then<\/span>
\n echo<\/span> "\u63d0\u4ea4\u4fe1\u606f\u683c\u5f0f\u9519\u8bef！\u8bf7\u4f7f\u7528：type(scope): description"<\/span>
\n echo<\/span> "\u793a\u4f8b：feat(auth): \u6dfb\u52a0\u5fae\u4fe1\u767b\u5f55\u529f\u80fd"<\/span>
\n exit<\/span> 1<\/span>
\nfi<\/span><\/p>\n

exit<\/span> 0<\/span><\/p>\n

14.4 \u4f7f\u7528 Husky \u7ba1\u7406\u94a9\u5b50（Node.js \u9879\u76ee）<\/h4>\n

# \u5b89\u88c5 husky<\/span>
\nnpm<\/span> install<\/span> husky –save-dev<\/p>\n

# \u521d\u59cb\u5316 husky<\/span>
\nnpx husky init<\/p>\n

# \u6dfb\u52a0 pre-commit \u94a9\u5b50<\/span>
\necho<\/span> 'npm run lint'<\/span> ><\/span> .husky\/pre-commit<\/p>\n

# \u6dfb\u52a0 commit-msg \u94a9\u5b50<\/span>
\necho<\/span> 'npx commitlint –edit $1'<\/span> ><\/span> .husky\/commit-msg<\/p>\n

# package.json \u4e2d\u7684\u914d\u7f6e<\/span>
\n{<\/span>
\n "scripts"<\/span>:<\/span> {<\/span>
\n "prepare"<\/span>:<\/span> "husky"<\/span>
\n }<\/span>
\n}<\/span><\/p>\n

\n

\u5341\u4e94\u3001Git \u5de5\u4f5c\u6d41\u6a21\u578b<\/h3>\n

15.1 \u96c6\u4e2d\u5f0f\u5de5\u4f5c\u6d41<\/h4>\n

# \u6240\u6709\u4eba\u5728\u540c\u4e00\u5206\u652f（\u901a\u5e38\u662f main）\u4e0a\u5de5\u4f5c
\n# \u9002\u5408\u5c0f\u578b\u56e2\u961f<\/p>\n

git checkout main
\ngit pull origin main
\n# … \u4fee\u6539\u4ee3\u7801 …
\ngit add .
\ngit commit -m "\u4fee\u6539\u63cf\u8ff0"
\ngit push origin main<\/p>\n

15.2 \u529f\u80fd\u5206\u652f\u5de5\u4f5c\u6d41<\/h4>\n

# \u6bcf\u4e2a\u529f\u80fd\u4e00\u4e2a\u5206\u652f，\u901a\u8fc7 Pull Request \u5408\u5e76
\n# \u9002\u5408\u4e2d\u5c0f\u578b\u56e2\u961f<\/p>\n

# 1. \u4ece main \u521b\u5efa\u529f\u80fd\u5206\u652f
\ngit checkout -b feature\/xxx main<\/p>\n

# 2. \u5728\u529f\u80fd\u5206\u652f\u4e0a\u5f00\u53d1
\ngit add .
\ngit commit -m "feat: xxx"<\/p>\n

# 3. \u63a8\u9001\u529f\u80fd\u5206\u652f
\ngit push origin feature\/xxx<\/p>\n

# 4. \u521b\u5efa Pull Request<\/p>\n

# 5. \u4ee3\u7801\u5ba1\u67e5\u540e\u5408\u5e76\u5230 main<\/p>\n

# 6. \u5220\u9664\u529f\u80fd\u5206\u652f<\/p>\n

15.3 Git Flow \u5de5\u4f5c\u6d41<\/h4>\n

# \u5206\u652f\u89d2\u8272：
\n# main – \u751f\u4ea7\u73af\u5883\u4ee3\u7801
\n# develop – \u5f00\u53d1\u4e3b\u7ebf
\n# feature\/* – \u529f\u80fd\u5206\u652f
\n# release\/* – \u53d1\u5e03\u5206\u652f
\n# hotfix\/* – \u7d27\u6025\u4fee\u590d\u5206\u652f<\/p>\n

# \u5f00\u53d1\u65b0\u529f\u80fd
\ngit checkout -b feature\/login develop
\n# … \u5f00\u53d1 …
\ngit checkout develop
\ngit merge –no-ff feature\/login<\/p>\n

# \u51c6\u5907\u53d1\u5e03
\ngit checkout -b release\/1.0 develop
\n# … \u4fee\u590d\u5c0f bug …
\ngit checkout main
\ngit merge –no-ff release\/1.0
\ngit tag -a v1.0.0
\ngit checkout develop
\ngit merge –no-ff release\/1.0<\/p>\n

# \u7d27\u6025\u4fee\u590d
\ngit checkout -b hotfix\/1.0.1 main
\n# … \u4fee\u590d …
\ngit checkout main
\ngit merge –no-ff hotfix\/1.0.1
\ngit tag -a v1.0.1
\ngit checkout develop
\ngit merge –no-ff hotfix\/1.0.1<\/p>\n

15.4 GitHub Flow \u5de5\u4f5c\u6d41<\/h4>\n

# \u7b80\u5316\u7684\u5de5\u4f5c\u6d41，\u6301\u7eed\u90e8\u7f72
\n# main \u5206\u652f\u59cb\u7ec8\u53ef\u90e8\u7f72<\/p>\n

# 1. \u4ece main \u521b\u5efa\u529f\u80fd\u5206\u652f
\ngit checkout -b feature-branch<\/p>\n

# 2. \u5f00\u53d1\u5e76\u63d0\u4ea4
\ngit add .
\ngit commit -m "\u63cf\u8ff0"<\/p>\n

# 3. \u63a8\u9001\u5e76\u521b\u5efa Pull Request
\ngit push origin feature-branch<\/p>\n

# 4. \u8ba8\u8bba\u548c\u4ee3\u7801\u5ba1\u67e5<\/p>\n

# 5. \u5408\u5e76\u5230 main \u5e76\u90e8\u7f72<\/p>\n

# 6. \u5220\u9664\u529f\u80fd\u5206\u652f<\/p>\n

15.5 Trunk-Based Development（\u4e3b\u5e72\u5f00\u53d1）<\/h4>\n

# \u6240\u6709\u4eba\u76f4\u63a5\u5411 main \u63d0\u4ea4（\u6216\u4f7f\u7528\u77ed\u751f\u547d\u5468\u671f\u7684\u529f\u80fd\u5206\u652f）
\n# \u9700\u8981\u5b8c\u5584\u7684 CI\/CD \u548c\u6d4b\u8bd5\u8986\u76d6<\/p>\n

# \u77ed\u529f\u80fd\u5206\u652f\u65b9\u5f0f
\ngit checkout -b feature\/small-change
\n# … \u5c0f\u6539\u52a8 …
\ngit push origin feature\/small-change
\n# \u5feb\u901f\u5408\u5e76（\u51e0\u5c0f\u65f6\u5185）<\/p>\n

\n

\u5341\u516d\u3001\u5e38\u89c1\u95ee\u9898\u6392\u67e5<\/h3>\n

16.1 \u64a4\u9500\u5df2\u63a8\u9001\u7684\u63d0\u4ea4<\/h4>\n

# \u65b9\u5f0f\u4e00：\u4f7f\u7528 revert（\u63a8\u8350，\u5b89\u5168）<\/span>
\ngit<\/span> revert abc1234
\ngit<\/span> push origin main<\/p>\n

# \u65b9\u5f0f\u4e8c：\u4f7f\u7528 reset + force push（\u5371\u9669！\u4e0d\u63a8\u8350\u7528\u4e8e\u516c\u5171\u5206\u652f）<\/span>
\ngit<\/span> reset –hard<\/span> HEAD~1
\ngit<\/span> push –force<\/span> origin main
\n# \u6ce8\u610f：\u8fd9\u4f1a\u6539\u5199\u5386\u53f2，\u5f71\u54cd\u5176\u4ed6\u534f\u4f5c\u8005！<\/span><\/p>\n

16.2 \u4fee\u590d\u9519\u8bef\u7684\u5408\u5e76<\/h4>\n

# \u5982\u679c\u5408\u5e76\u540e\u8fd8\u6ca1\u6709\u63a8\u9001<\/span>
\ngit<\/span> reset –hard<\/span> HEAD~1 # \u56de\u9000\u5230\u5408\u5e76\u524d<\/span><\/p>\n

# \u5982\u679c\u5df2\u7ecf\u63a8\u9001\u4e86<\/span>
\ngit<\/span> revert -m<\/span> 1<\/span> <<\/span>merge-commit-hash><\/span>
\n# -m 1 \u8868\u793a\u4fdd\u7559\u7b2c\u4e00\u4e2a\u7236\u63d0\u4ea4（\u901a\u5e38\u662f\u4e3b\u5206\u652f）\u7684\u5185\u5bb9<\/span><\/p>\n

16.3 \u5904\u7406\u5927\u6587\u4ef6<\/h4>\n

# \u5982\u679c\u4e0d\u5c0f\u5fc3\u63d0\u4ea4\u4e86\u5927\u6587\u4ef6<\/span>
\n# \u4f7f\u7528 BFG Repo-Cleaner \u6e05\u7406<\/span>
\n# \u4e0b\u8f7d：https:\/\/rtyley.github.io\/bfg-repo-cleaner\/<\/span><\/p>\n

# \u5220\u9664\u5927\u4e8e 100MB \u7684\u6587\u4ef6<\/span>
\njava<\/span> -jar<\/span> bfg.jar –strip-blobs-bigger-than 100M repo.git<\/p>\n

# \u5220\u9664\u7279\u5b9a\u6587\u4ef6<\/span>
\njava<\/span> -jar<\/span> bfg.jar –delete-files filename.zip repo.git<\/p>\n

# \u4f7f\u7528 git-filter-repo<\/span>
\ngit<\/span> filter-repo –strip-blobs-bigger-than 10M<\/p>\n

# \u914d\u7f6e Git LFS（\u5927\u6587\u4ef6\u5b58\u50a8）<\/span>
\ngit<\/span> lfs install<\/span>
\ngit<\/span> lfs track "*.psd"<\/span>
\ngit<\/span> lfs track "*.zip"<\/span>
\ngit<\/span> add<\/span> .gitattributes<\/p>\n

16.4 \u4fee\u590d\u635f\u574f\u7684\u4ed3\u5e93<\/h4>\n

# \u68c0\u67e5\u4ed3\u5e93\u5b8c\u6574\u6027<\/span>
\ngit<\/span> fsck<\/span><\/p>\n

# \u4fee\u590d\u635f\u574f\u7684\u5bf9\u8c61<\/span>
\ngit<\/span> fsck<\/span> –full<\/span><\/p>\n

# \u4ece\u635f\u574f\u4e2d\u6062\u590d<\/span>
\ngit<\/span> fetch origin
\ngit<\/span> reset –hard<\/span> origin\/main<\/p>\n

16.5 \u89e3\u51b3 \u201cdetached HEAD\u201d \u72b6\u6001<\/h4>\n

# \u5f53\u4f60\u5728\u67d0\u4e2a\u63d0\u4ea4\u4e0a\u800c\u4e0d\u662f\u5206\u652f\u4e0a\u65f6<\/span>
\n# \u67e5\u770b\u5f53\u524d\u72b6\u6001<\/span>
\ngit<\/span> status<\/p>\n

# \u521b\u5efa\u65b0\u5206\u652f\u6765\u4fdd\u7559\u4f60\u7684\u4fee\u6539<\/span>
\ngit<\/span> checkout -b<\/span> new-branch-name<\/p>\n

# \u6216\u8005\u5207\u6362\u56de\u5df2\u6709\u5206\u652f<\/span>
\ngit<\/span> checkout main<\/p>\n

16.6 \u5904\u7406\u884c\u5c3e\u7b26\u95ee\u9898<\/h4>\n

# \u914d\u7f6e\u884c\u5c3e\u7b26\u5904\u7406<\/span>
\n# Windows<\/span>
\ngit<\/span> config –global<\/span> core.autocrlf true<\/span>
\n# Linux\/Mac<\/span>
\ngit<\/span> config –global<\/span> core.autocrlf input<\/p>\n

# \u521b\u5efa .gitattributes \u6587\u4ef6<\/span>
\n* text<\/span>=<\/span>auto
\n*.sh text eol<\/span>=<\/span>lf
\n*.bat text eol<\/span>=<\/span>crlf
\n*.py text eol<\/span>=<\/span>lf
\n*.js text eol<\/span>=<\/span>lf
\n*.java text eol<\/span>=<\/span>lf<\/p>\n

# \u4fee\u590d\u5df2\u63d0\u4ea4\u6587\u4ef6\u7684\u884c\u5c3e\u7b26<\/span>
\ngit<\/span> add<\/span> –renormalize<\/span> .<\/span>
\ngit<\/span> commit -m<\/span> "fix: \u7edf\u4e00\u884c\u5c3e\u7b26"<\/span><\/p>\n

16.7 \u627e\u56de\u4e22\u5931\u7684\u63d0\u4ea4<\/h4>\n

# \u4f7f\u7528 reflog \u67e5\u627e<\/span>
\ngit<\/span> reflog<\/p>\n

# \u627e\u5230\u76ee\u6807\u63d0\u4ea4\u540e<\/span>
\ngit<\/span> checkout abc1234
\n# \u6216<\/span>
\ngit<\/span> branch recover-branch abc1234<\/p>\n

# \u4f7f\u7528 fsck \u67e5\u627e\u4e0d\u53ef\u8fbe\u7684\u63d0\u4ea4<\/span>
\ngit<\/span> fsck<\/span> –unreachable<\/span>
\ngit<\/span> fsck<\/span> –lost-found<\/p>\n

\n

\u5341\u4e03\u3001Git \u522b\u540d\u914d\u7f6e<\/h3>\n

# \u5e38\u7528\u522b\u540d\u914d\u7f6e<\/span>
\ngit<\/span> config –global<\/span> alias.st status
\ngit<\/span> config –global<\/span> alias.co checkout
\ngit<\/span> config –global<\/span> alias.br branch
\ngit<\/span> config –global<\/span> alias.ci commit
\ngit<\/span> config –global<\/span> alias.df diff<\/span>
\ngit<\/span> config –global<\/span> alias.dfc "diff –cached"<\/span>
\ngit<\/span> config –global<\/span> alias.lg "log –oneline –graph –all –decorate"<\/span>
\ngit<\/span> config –global<\/span> alias.last "log -1 HEAD"<\/span>
\ngit<\/span> config –global<\/span> alias.unstage "reset HEAD –"<\/span>
\ngit<\/span> config –global<\/span> alias.visual "log –graph –oneline –all –decorate"<\/span>
\ngit<\/span> config –global<\/span> alias.amend "commit –amend –no-edit"<\/span>
\ngit<\/span> config –global<\/span> alias.pushf "push –force-with-lease"<\/span>
\ngit<\/span> config –global<\/span> alias.undo "reset –soft HEAD~1"<\/span>
\ngit<\/span> config –global<\/span> alias.stash-all "stash push –include-untracked"<\/span>
\ngit<\/span> config –global<\/span> alias.contributors "shortlog -sn –no-merges"<\/span><\/p>\n

# \u4f7f\u7528\u793a\u4f8b<\/span>
\ngit<\/span> st # git status<\/span>
\ngit<\/span> co main # git checkout main<\/span>
\ngit<\/span> br # git branch<\/span>
\ngit<\/span> ci -m<\/span> "msg"<\/span> # git commit -m "msg"<\/span>
\ngit<\/span> lg # \u56fe\u5f62\u5316\u65e5\u5fd7<\/span>
\ngit<\/span> amend # \u4fee\u6539\u6700\u8fd1\u4e00\u6b21\u63d0\u4ea4<\/span>
\ngit<\/span> undo # \u64a4\u9500\u6700\u8fd1\u4e00\u6b21\u63d0\u4ea4（\u4fdd\u7559\u4fee\u6539）<\/span><\/p>\n

\n

\u5341\u516b\u3001.gitignore \u8be6\u89e3<\/h3>\n

18.1 \u57fa\u672c\u8bed\u6cd5<\/h4>\n

# \u5ffd\u7565\u6240\u6709 .log \u6587\u4ef6
\n*.log<\/p>\n

# \u5ffd\u7565 build \u76ee\u5f55
\nbuild\/<\/p>\n

# \u5ffd\u7565\u6839\u76ee\u5f55\u4e0b\u7684 TODO \u6587\u4ef6（\u4e0d\u5305\u62ec\u5b50\u76ee\u5f55）
\n\/TODO<\/p>\n

# \u5ffd\u7565 doc \u76ee\u5f55\u4e0b\u7684\u6240\u6709 .pdf \u6587\u4ef6
\ndoc\/**\/*.pdf<\/p>\n

# \u4e0d\u5ffd\u7565 important.log（\u53d6\u53cd\u89c4\u5219）
\n!important.log<\/p>\n

# \u5ffd\u7565\u6240\u6709 .pyc \u6587\u4ef6
\n*.pyc<\/p>\n

# \u5ffd\u7565\u6240\u6709 __pycache__ \u76ee\u5f55
\n__pycache__\/<\/p>\n

# \u5ffd\u7565 .env \u6587\u4ef6
\n.env<\/p>\n

# \u5ffd\u7565 .DS_Store（macOS）
\n.DS_Store<\/p>\n

# \u5ffd\u7565 Thumbs.db（Windows）
\nThumbs.db<\/p>\n

# \u5ffd\u7565 IDE \u914d\u7f6e
\n.idea\/
\n.vscode\/
\n*.swp
\n*.swo<\/p>\n

# \u5ffd\u7565 node_modules
\nnode_modules\/<\/p>\n

# \u5ffd\u7565\u4f9d\u8d56\u76ee\u5f55
\nvendor\/<\/p>\n

18.2 \u901a\u914d\u7b26\u8bf4\u660e<\/h4>\n

# * \u5339\u914d\u4efb\u610f\u5b57\u7b26（\u4e0d\u5305\u62ec \/）
\n# ** \u5339\u914d\u4efb\u610f\u76ee\u5f55\u5c42\u7ea7
\n# ? \u5339\u914d\u5355\u4e2a\u5b57\u7b26（\u4e0d\u5305\u62ec \/）
\n# [abc] \u5339\u914d\u65b9\u62ec\u53f7\u4e2d\u7684\u4efb\u4e00\u5b57\u7b26
\n# [0-9] \u5339\u914d\u8303\u56f4\u5185\u7684\u4efb\u4e00\u5b57\u7b26<\/p>\n

# \u793a\u4f8b：
\n# *.txt \u5339\u914d\u6240\u6709 .txt \u6587\u4ef6
\n# **\/*.txt \u5339\u914d\u4efb\u610f\u6df1\u5ea6\u7684 .txt \u6587\u4ef6
\n# doc\/**\/*.pdf \u5339\u914d doc \u76ee\u5f55\u4e0b\u6240\u6709 .pdf \u6587\u4ef6
\n# build\/*\/output \u5339\u914d build\/x\/output \u4f46\u4e0d\u5339\u914d build\/x\/y\/output<\/p>\n

18.3 \u5e38\u7528\u6a21\u677f<\/h4>\n

# === Python ===
\n__pycache__\/
\n*.py[cod]
\n*$py.class
\n*.so
\n.Python
\nenv\/
\nvenv\/
\n.venv\/
\n*.egg-info\/
\ndist\/
\nbuild\/
\n.eggs\/
\n*.egg
\n.mypy_cache\/
\n.pytest_cache\/
\n.coverage
\nhtmlcov\/<\/p>\n

# === Node.js ===
\nnode_modules\/
\nnpm-debug.log*
\nyarn-debug.log*
\nyarn-error.log*
\n.npm
\n.eslintcache
\ndist\/
\nbuild\/<\/p>\n

# === Java ===
\n*.class
\n*.jar
\n*.war
\n*.ear
\ntarget\/
\n.gradle\/
\n*.log<\/p>\n

# === Go ===
\n*.exe
\n*.exe~
\n*.dll
\n*.so
\n*.dylib
\n*.test
\n*.out
\nvendor\/<\/p>\n

# === Rust ===
\n\/target\/
\n**\/*.rs.bk
\nCargo.lock<\/p>\n

# === IDE ===
\n.idea\/
\n.vscode\/
\n*.swp
\n*.swo
\n*~
\n.project
\n.classpath
\n.settings\/<\/p>\n

# === OS ===
\n.DS_Store
\n.DS_Store?
\n._*
\n.Spotlight-V100
\n.Trashes
\nThumbs.db
\nehthumbs.db
\nDesktop.ini<\/p>\n

# === \u73af\u5883\u53d8\u91cf\u548c\u5bc6\u94a5 ===
\n.env
\n.env.local
\n.env.*.local
\n*.pem
\n*.key<\/p>\n

18.4 \u5168\u5c40 .gitignore<\/h4>\n

# \u8bbe\u7f6e\u5168\u5c40 gitignore \u6587\u4ef6<\/span>
\ngit<\/span> config –global<\/span> core.excludesFile ~\/.gitignore_global<\/p>\n

# \u521b\u5efa\u5168\u5c40 gitignore<\/span>
\necho<\/span> ".DS_Store"<\/span> >><\/span> ~\/.gitignore_global
\necho<\/span> "Thumbs.db"<\/span> >><\/span> ~\/.gitignore_global
\necho<\/span> ".idea\/"<\/span> >><\/span> ~\/.gitignore_global
\necho<\/span> ".vscode\/"<\/span> >><\/span> ~\/.gitignore_global<\/p>\n

18.5 \u6e05\u7406\u5df2\u8ddf\u8e2a\u7684\u88ab\u5ffd\u7565\u6587\u4ef6<\/h4>\n

# \u5982\u679c\u67d0\u4e9b\u6587\u4ef6\u4e4b\u524d\u88ab\u63d0\u4ea4\u4e86，\u73b0\u5728\u60f3\u52a0\u5165 .gitignore<\/span><\/p>\n

# 1. \u4ece\u8ddf\u8e2a\u4e2d\u79fb\u9664（\u4e0d\u5220\u9664\u672c\u5730\u6587\u4ef6）<\/span>
\ngit<\/span> rm<\/span> –cached<\/span> filename.txt
\ngit<\/span> rm<\/span> -r<\/span> –cached<\/span> directory\/<\/p>\n

# 2. \u66f4\u65b0 .gitignore \u6587\u4ef6<\/span>
\necho<\/span> "filename.txt"<\/span> >><\/span> .gitignore<\/p>\n

# 3. \u63d0\u4ea4<\/span>
\ngit<\/span> add<\/span> .gitignore
\ngit<\/span> commit -m<\/span> "chore: \u66f4\u65b0 .gitignore，\u79fb\u9664\u5df2\u8ddf\u8e2a\u7684\u5ffd\u7565\u6587\u4ef6"<\/span><\/p>\n

\n

\u9644\u5f55：\u5e38\u7528\u547d\u4ee4\u901f\u67e5\u8868<\/h3>\n\n\u64cd\u4f5c\u547d\u4ee4<\/tr>\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
\u521d\u59cb\u5316\u4ed3\u5e93<\/td>\ngit init<\/td>\n<\/tr>\n
\u514b\u9686\u4ed3\u5e93<\/td>\ngit clone <url><\/td>\n<\/tr>\n
\u67e5\u770b\u72b6\u6001<\/td>\ngit status<\/td>\n<\/tr>\n
\u6dfb\u52a0\u5230\u6682\u5b58\u533a<\/td>\ngit add .<\/td>\n<\/tr>\n
\u63d0\u4ea4<\/td>\ngit commit -m "msg"<\/td>\n<\/tr>\n
\u63a8\u9001<\/td>\ngit push origin <branch><\/td>\n<\/tr>\n
\u62c9\u53d6<\/td>\ngit pull origin <branch><\/td>\n<\/tr>\n
\u521b\u5efa\u5206\u652f<\/td>\ngit branch <name><\/td>\n<\/tr>\n
\u5207\u6362\u5206\u652f<\/td>\ngit switch <name><\/td>\n<\/tr>\n
\u5408\u5e76\u5206\u652f<\/td>\ngit merge <branch><\/td>\n<\/tr>\n
\u67e5\u770b\u65e5\u5fd7<\/td>\ngit log –oneline –graph<\/td>\n<\/tr>\n
\u67e5\u770b\u5dee\u5f02<\/td>\ngit diff<\/td>\n<\/tr>\n
\u50a8\u85cf\u4fee\u6539<\/td>\ngit stash<\/td>\n<\/tr>\n
\u6062\u590d\u50a8\u85cf<\/td>\ngit stash pop<\/td>\n<\/tr>\n
\u64a4\u9500\u4fee\u6539<\/td>\ngit restore <file><\/td>\n<\/tr>\n
\u56de\u9000\u63d0\u4ea4<\/td>\ngit reset –soft HEAD~1<\/td>\n<\/tr>\n
\u53cd\u8f6c\u63d0\u4ea4<\/td>\ngit revert <commit><\/td>\n<\/tr>\n
\u521b\u5efa\u6807\u7b7e<\/td>\ngit tag -a v1.0 -m "msg"<\/td>\n<\/tr>\n
\u67e5\u770b\u6807\u7b7e<\/td>\ngit tag<\/td>\n<\/tr>\n
\u6682\u5b58\u5de5\u4f5c<\/td>\ngit stash push -m "msg"<\/td>\n<\/tr>\n
Cherry-pick<\/td>\ngit cherry-pick <commit><\/td>\n<\/tr>\n
\u4ea4\u4e92\u5f0f\u53d8\u57fa<\/td>\ngit rebase -i HEAD~N<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n
\n

\u6700\u540e\u66f4\u65b0：2026-07-26<\/p>\n","protected":false},"excerpt":{"rendered":"

Git \u64cd\u4f5c\u5927\u5168\u672c\u6587\u6863\u6db5\u76d6 Git \u4ece\u5165\u95e8\u5230\u9ad8\u7ea7\u7684\u5b8c\u6574\u64cd\u4f5c\u6307\u5357\u4e00\u3001\u57fa\u7840\u914d\u7f6e
\n1.1 \u7528\u6237\u4fe1\u606f\u914d\u7f6e
\n# \u8bbe\u7f6e\u5168\u5c40\u7528\u6237\u540d（\u6240\u6709\u4ed3\u5e93\u751f\u6548）
\ngit config –global user.name \\”Your Name\\”# \u8bbe\u7f6e\u5168\u5c40\u90ae\u7bb1
\ngit config –global user.email \\”your.emailexample.com\\”# \u4ec5\u5bf9\u5f53\u524d\u4ed3\u5e93\u8bbe\u7f6e\u7528\u6237\u540d（\u8986\u76d6\u5168\u5c40\u914d\u7f6e）
\ngit config user.nam<\/p>\n","protected":false},"author":2,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[81,190],"topic":[],"class_list":["post-84261","post","type-post","status-publish","format-standard","hentry","category-server","tag-python","tag-190"],"yoast_head":"\nGit \u64cd\u4f5c\u5927\u5168 - \u7f51\u7855\u4e92\u8054\u5e2e\u52a9\u4e2d\u5fc3<\/title>\n<meta name=\"robots\" content=\"index, follow, max-snippet:-1, max-image-preview:large, max-video-preview:-1\" \/>\n<link rel=\"canonical\" href=\"https:\/\/www.wsisp.com\/helps\/84261.html\" \/>\n<meta property=\"og:locale\" content=\"zh_CN\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"Git \u64cd\u4f5c\u5927\u5168 - \u7f51\u7855\u4e92\u8054\u5e2e\u52a9\u4e2d\u5fc3\" \/>\n<meta property=\"og:description\" content=\"Git \u64cd\u4f5c\u5927\u5168\u672c\u6587\u6863\u6db5\u76d6 Git \u4ece\u5165\u95e8\u5230\u9ad8\u7ea7\u7684\u5b8c\u6574\u64cd\u4f5c\u6307\u5357\u4e00\u3001\u57fa\u7840\u914d\u7f6e 1.1 \u7528\u6237\u4fe1\u606f\u914d\u7f6e # \u8bbe\u7f6e\u5168\u5c40\u7528\u6237\u540d（\u6240\u6709\u4ed3\u5e93\u751f\u6548） git config --global user.name "Your Name"# \u8bbe\u7f6e\u5168\u5c40\u90ae\u7bb1 git config --global user.email "your.emailexample.com"# \u4ec5\u5bf9\u5f53\u524d\u4ed3\u5e93\u8bbe\u7f6e\u7528\u6237\u540d（\u8986\u76d6\u5168\u5c40\u914d\u7f6e） git config user.nam\" \/>\n<meta property=\"og:url\" content=\"https:\/\/www.wsisp.com\/helps\/84261.html\" \/>\n<meta property=\"og:site_name\" content=\"\u7f51\u7855\u4e92\u8054\u5e2e\u52a9\u4e2d\u5fc3\" \/>\n<meta property=\"article:published_time\" content=\"2026-07-26T02:18:31+00:00\" \/>\n<meta name=\"author\" content=\"admin\" \/>\n<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n<meta name=\"twitter:label1\" content=\"\u4f5c\u8005\" \/>\n\t<meta name=\"twitter:data1\" content=\"admin\" \/>\n\t<meta name=\"twitter:label2\" content=\"\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4\" \/>\n\t<meta name=\"twitter:data2\" content=\"18 \u5206\" \/>\n<script type=\"application\/ld+json\" class=\"yoast-schema-graph\">{\"@context\":\"https:\/\/schema.org\",\"@graph\":[{\"@type\":\"WebPage\",\"@id\":\"https:\/\/www.wsisp.com\/helps\/84261.html\",\"url\":\"https:\/\/www.wsisp.com\/helps\/84261.html\",\"name\":\"Git \u64cd\u4f5c\u5927\u5168 - \u7f51\u7855\u4e92\u8054\u5e2e\u52a9\u4e2d\u5fc3\",\"isPartOf\":{\"@id\":\"https:\/\/www.wsisp.com\/helps\/#website\"},\"datePublished\":\"2026-07-26T02:18:31+00:00\",\"dateModified\":\"2026-07-26T02:18:31+00:00\",\"author\":{\"@id\":\"https:\/\/www.wsisp.com\/helps\/#\/schema\/person\/358e386c577a3ab51c4493330a20ad41\"},\"breadcrumb\":{\"@id\":\"https:\/\/www.wsisp.com\/helps\/84261.html#breadcrumb\"},\"inLanguage\":\"zh-Hans\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/www.wsisp.com\/helps\/84261.html\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/www.wsisp.com\/helps\/84261.html#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u9996\u9875\",\"item\":\"https:\/\/www.wsisp.com\/helps\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"Git \u64cd\u4f5c\u5927\u5168\"}]},{\"@type\":\"WebSite\",\"@id\":\"https:\/\/www.wsisp.com\/helps\/#website\",\"url\":\"https:\/\/www.wsisp.com\/helps\/\",\"name\":\"\u7f51\u7855\u4e92\u8054\u5e2e\u52a9\u4e2d\u5fc3\",\"description\":\"\u9999\u6e2f\u670d\u52a1\u5668_\u9999\u6e2f\u4e91\u670d\u52a1\u5668\u8d44\u8baf_\u670d\u52a1\u5668\u5e2e\u52a9\u6587\u6863_\u670d\u52a1\u5668\u6559\u7a0b\",\"potentialAction\":[{\"@type\":\"SearchAction\",\"target\":{\"@type\":\"EntryPoint\",\"urlTemplate\":\"https:\/\/www.wsisp.com\/helps\/?s={search_term_string}\"},\"query-input\":\"required name=search_term_string\"}],\"inLanguage\":\"zh-Hans\"},{\"@type\":\"Person\",\"@id\":\"https:\/\/www.wsisp.com\/helps\/#\/schema\/person\/358e386c577a3ab51c4493330a20ad41\",\"name\":\"admin\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.wsisp.com\/helps\/#\/schema\/person\/image\/\",\"url\":\"https:\/\/gravatar.wp-china-yes.net\/avatar\/?s=96&d=mystery\",\"contentUrl\":\"https:\/\/gravatar.wp-china-yes.net\/avatar\/?s=96&d=mystery\",\"caption\":\"admin\"},\"sameAs\":[\"http:\/\/wp.wsisp.com\"],\"url\":\"https:\/\/www.wsisp.com\/helps\/author\/admin\"}]}<\/script>\n<!-- \/ Yoast SEO plugin. -->","yoast_head_json":{"title":"Git \u64cd\u4f5c\u5927\u5168 - \u7f51\u7855\u4e92\u8054\u5e2e\u52a9\u4e2d\u5fc3","robots":{"index":"index","follow":"follow","max-snippet":"max-snippet:-1","max-image-preview":"max-image-preview:large","max-video-preview":"max-video-preview:-1"},"canonical":"https:\/\/www.wsisp.com\/helps\/84261.html","og_locale":"zh_CN","og_type":"article","og_title":"Git \u64cd\u4f5c\u5927\u5168 - \u7f51\u7855\u4e92\u8054\u5e2e\u52a9\u4e2d\u5fc3","og_description":"Git \u64cd\u4f5c\u5927\u5168\u672c\u6587\u6863\u6db5\u76d6 Git \u4ece\u5165\u95e8\u5230\u9ad8\u7ea7\u7684\u5b8c\u6574\u64cd\u4f5c\u6307\u5357\u4e00\u3001\u57fa\u7840\u914d\u7f6e 1.1 \u7528\u6237\u4fe1\u606f\u914d\u7f6e # \u8bbe\u7f6e\u5168\u5c40\u7528\u6237\u540d（\u6240\u6709\u4ed3\u5e93\u751f\u6548） git config --global user.name \"Your Name\"# \u8bbe\u7f6e\u5168\u5c40\u90ae\u7bb1 git config --global user.email \"your.emailexample.com\"# \u4ec5\u5bf9\u5f53\u524d\u4ed3\u5e93\u8bbe\u7f6e\u7528\u6237\u540d（\u8986\u76d6\u5168\u5c40\u914d\u7f6e） git config user.nam","og_url":"https:\/\/www.wsisp.com\/helps\/84261.html","og_site_name":"\u7f51\u7855\u4e92\u8054\u5e2e\u52a9\u4e2d\u5fc3","article_published_time":"2026-07-26T02:18:31+00:00","author":"admin","twitter_card":"summary_large_image","twitter_misc":{"\u4f5c\u8005":"admin","\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4":"18 \u5206"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"WebPage","@id":"https:\/\/www.wsisp.com\/helps\/84261.html","url":"https:\/\/www.wsisp.com\/helps\/84261.html","name":"Git \u64cd\u4f5c\u5927\u5168 - \u7f51\u7855\u4e92\u8054\u5e2e\u52a9\u4e2d\u5fc3","isPartOf":{"@id":"https:\/\/www.wsisp.com\/helps\/#website"},"datePublished":"2026-07-26T02:18:31+00:00","dateModified":"2026-07-26T02:18:31+00:00","author":{"@id":"https:\/\/www.wsisp.com\/helps\/#\/schema\/person\/358e386c577a3ab51c4493330a20ad41"},"breadcrumb":{"@id":"https:\/\/www.wsisp.com\/helps\/84261.html#breadcrumb"},"inLanguage":"zh-Hans","potentialAction":[{"@type":"ReadAction","target":["https:\/\/www.wsisp.com\/helps\/84261.html"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/www.wsisp.com\/helps\/84261.html#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u9996\u9875","item":"https:\/\/www.wsisp.com\/helps"},{"@type":"ListItem","position":2,"name":"Git \u64cd\u4f5c\u5927\u5168"}]},{"@type":"WebSite","@id":"https:\/\/www.wsisp.com\/helps\/#website","url":"https:\/\/www.wsisp.com\/helps\/","name":"\u7f51\u7855\u4e92\u8054\u5e2e\u52a9\u4e2d\u5fc3","description":"\u9999\u6e2f\u670d\u52a1\u5668_\u9999\u6e2f\u4e91\u670d\u52a1\u5668\u8d44\u8baf_\u670d\u52a1\u5668\u5e2e\u52a9\u6587\u6863_\u670d\u52a1\u5668\u6559\u7a0b","potentialAction":[{"@type":"SearchAction","target":{"@type":"EntryPoint","urlTemplate":"https:\/\/www.wsisp.com\/helps\/?s={search_term_string}"},"query-input":"required name=search_term_string"}],"inLanguage":"zh-Hans"},{"@type":"Person","@id":"https:\/\/www.wsisp.com\/helps\/#\/schema\/person\/358e386c577a3ab51c4493330a20ad41","name":"admin","image":{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.wsisp.com\/helps\/#\/schema\/person\/image\/","url":"https:\/\/gravatar.wp-china-yes.net\/avatar\/?s=96&d=mystery","contentUrl":"https:\/\/gravatar.wp-china-yes.net\/avatar\/?s=96&d=mystery","caption":"admin"},"sameAs":["http:\/\/wp.wsisp.com"],"url":"https:\/\/www.wsisp.com\/helps\/author\/admin"}]}},"_links":{"self":[{"href":"https:\/\/www.wsisp.com\/helps\/wp-json\/wp\/v2\/posts\/84261","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.wsisp.com\/helps\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.wsisp.com\/helps\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.wsisp.com\/helps\/wp-json\/wp\/v2\/users\/2"}],"replies":[{"embeddable":true,"href":"https:\/\/www.wsisp.com\/helps\/wp-json\/wp\/v2\/comments?post=84261"}],"version-history":[{"count":0,"href":"https:\/\/www.wsisp.com\/helps\/wp-json\/wp\/v2\/posts\/84261\/revisions"}],"wp:attachment":[{"href":"https:\/\/www.wsisp.com\/helps\/wp-json\/wp\/v2\/media?parent=84261"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.wsisp.com\/helps\/wp-json\/wp\/v2\/categories?post=84261"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.wsisp.com\/helps\/wp-json\/wp\/v2\/tags?post=84261"},{"taxonomy":"topic","embeddable":true,"href":"https:\/\/www.wsisp.com\/helps\/wp-json\/wp\/v2\/topic?post=84261"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}