{"id":170,"date":"2026-09-26T12:03:15","date_gmt":"2026-09-26T04:03:15","guid":{"rendered":"https:\/\/blog.leawsic.ltd\/?p=170"},"modified":"2026-09-26T18:52:32","modified_gmt":"2026-09-26T10:52:32","slug":"%e5%9f%ba%e4%ba%8e-git-%e7%9a%84%e5%8d%8f%e4%bd%9c%e6%b5%81%e7%a8%8b%e6%8c%87%e5%af%bc","status":"publish","type":"post","link":"https:\/\/blog.leawsic.ltd\/index.php\/2026\/09\/26\/%e5%9f%ba%e4%ba%8e-git-%e7%9a%84%e5%8d%8f%e4%bd%9c%e6%b5%81%e7%a8%8b%e6%8c%87%e5%af%bc\/","title":{"rendered":"\u57fa\u4e8e git \u7684\u534f\u4f5c\u6d41\u7a0b\u6307\u5bfc\u53ca\u5e38\u7528command"},"content":{"rendered":"\n<p class=\"wp-block-paragraph\">\u8fd9\u662f\u8d21\u732e\u4ee3\u7801\u7684\u6807\u51c6\u6d41\u7a0b\u3002<\/p>\n\n\n\n<ul class=\"wp-block-list\">\n<li><strong>Fork \u9879\u76ee<\/strong>\uff1a\u5728 GitHub \u4e0a\uff0c\u70b9\u51fb\u539f\u9879\u76ee\u9875\u9762\u53f3\u4e0a\u89d2\u7684 <strong>\u201cFork\u201d<\/strong> \u6309\u94ae\u3002\u8fd9\u4f1a\u5728\u4f60\u7684 GitHub \u8d26\u53f7\u4e0b\u521b\u5efa\u4e00\u4e2a\u8be5\u9879\u76ee\u7684\u5b8c\u6574\u526f\u672c\u3002<\/li>\n\n\n\n<li><strong>Clone \u5230\u672c\u5730<\/strong>\uff1a\u5c06\u4f60 Fork \u7684\u4ed3\u5e93\u514b\u9686\u5230\u4f60\u7684\u7535\u8111\u4e0a\u3002 <code>git clone https:\/\/github.com\/\u4f60\u7684\u7528\u6237\u540d\/\u9879\u76ee\u540d.git<\/code><\/li>\n\n\n\n<li><strong>\u6dfb\u52a0 upstream \u8fdc\u7a0b\u4ed3\u5e93<\/strong>\uff1a\u4e3a\u4e86\u80fd\u968f\u65f6\u540c\u6b65\u539f\u9879\u76ee\u7684\u6700\u65b0\u4ee3\u7801\uff0c\u9700\u8981\u5c06\u539f\u9879\u76ee\u6dfb\u52a0\u4e3a\u4e00\u4e2a\u540d\u4e3a <code>upstream<\/code> \u7684\u8fdc\u7a0b\u4ed3\u5e93\u3002 <code>git remote add upstream https:\/\/github.com\/\u539f\u4f5c\u8005\/\u9879\u76ee\u540d.git<\/code><\/li>\n\n\n\n<li><strong>\u521b\u5efa\u529f\u80fd\u5206\u652f<\/strong>\uff1a<strong>\u6c38\u8fdc\u4e0d\u8981\u76f4\u63a5\u5728 <code>main<\/code> \u6216 <code>master<\/code> \u5206\u652f\u4e0a\u4fee\u6539\u4ee3\u7801<\/strong>\u3002\u5e94\u8be5\u4ece\u6700\u65b0\u7684\u4e3b\u5206\u652f\u521b\u5efa\u4e00\u4e2a\u65b0\u7684\u3001\u63cf\u8ff0\u6027\u7684\u5206\u652f\u6765\u5f00\u53d1\u3002 <code># 1. \u5148\u5207\u6362\u5230\u4e3b\u5206\u652f\u5e76\u540c\u6b65 upstream \u7684\u6700\u65b0\u4ee3\u7801 git checkout main \/ git fetch upstream \/ git rebase upstream\/main # 2. \u521b\u5efa\u5e76\u5207\u6362\u5230\u65b0\u5206\u652f git checkout -b feature\/\u4f60\u7684\u529f\u80fd\u63cf\u8ff0<\/code><\/li>\n\n\n\n<li><strong>\u5f00\u53d1\u4e0e\u63d0\u4ea4<\/strong>\uff1a\u5728\u65b0\u5206\u652f\u4e0a\u8fdb\u884c\u4f60\u7684\u4ee3\u7801\u4fee\u6539\u3002\u5b8c\u6210\u540e\uff0c<strong>\u7f16\u5199\u6e05\u6670\u3001\u89c4\u8303\u7684\u63d0\u4ea4\u4fe1\u606f\uff08Commit Message\uff09<\/strong> \u5e76\u63d0\u4ea4\u3002 <code>git add . \/ git commit -m \"feat: \u6dfb\u52a0\u4e86\u67d0\u67d0\u529f\u80fd\" # \u63d0\u4ea4\u4fe1\u606f\u5e94\u7b80\u6d01\u660e\u4e86<\/code><strong>\u63d0\u4ea4\u4fe1\u606f\u683c\u5f0f<\/strong>\uff1a\u5f88\u591a\u9879\u76ee\u8981\u6c42\u9075\u5faa\u7279\u5b9a\u683c\u5f0f\uff0c\u5982 <code>feat: \u6dfb\u52a0\u4e86\u65b0\u529f\u80fd<\/code> \u6216 <code>fix: \u4fee\u590d\u4e86\u67d0\u67d0 bug<\/code>\u3002\u8bf7\u53c2\u8003\u9879\u76ee\u7684 <code>CONTRIBUTING.md<\/code>\u3002<\/li>\n\n\n\n<li><strong>\u63a8\u9001\u5230\u4f60\u7684 Fork<\/strong>\uff1a\u5c06\u672c\u5730\u5206\u652f\u63a8\u9001\u5230\u4f60\u5728 GitHub \u4e0a\u7684 Fork \u4ed3\u5e93\u3002 <code>git push origin feature\/\u4f60\u7684\u529f\u80fd\u63cf\u8ff0<\/code><\/li>\n\n\n\n<li><strong>\u521b\u5efa Pull Request (PR)<\/strong>\uff1a\u5728 GitHub \u4e0a\u4f60\u7684 Fork \u4ed3\u5e93\u9875\u9762\uff0c\u70b9\u51fb <strong>\u201cCompare &amp; pull request\u201d<\/strong> \u6309\u94ae\u3002\n<ul class=\"wp-block-list\">\n<li><strong>Base repository<\/strong>\uff1a\u9009\u62e9\u539f\u9879\u76ee\u53ca\u5176\u76ee\u6807\u5206\u652f\uff08\u901a\u5e38\u662f <code>main<\/code>\uff09\u3002<\/li>\n\n\n\n<li><strong>Head repository<\/strong>\uff1a\u9009\u62e9\u4f60\u7684 Fork \u4ed3\u5e93\u548c\u4f60\u521a\u624d\u63a8\u9001\u7684\u5206\u652f\u3002<\/li>\n\n\n\n<li>\u586b\u5199\u6e05\u6670\u7684\u6807\u9898\u548c\u63cf\u8ff0\uff0c\u8bf4\u660e\u4f60\u505a\u4e86\u4ec0\u4e48\u3001\u4e3a\u4ec0\u4e48\u8fd9\u4e48\u505a\u3002\u5982\u679c\u5173\u8054\u4e86 Issue\uff0c\u53ef\u4ee5\u4f7f\u7528 <code>Fixes #123<\/code> \u8fd9\u6837\u7684\u5173\u952e\u8bcd\u6765\u81ea\u52a8\u5173\u95ed Issue\u3002\u6700\u540e\u70b9\u51fb <strong>\u201cCreate pull request\u201d<\/strong>\u3002<\/li>\n<\/ul>\n<\/li>\n<\/ul>\n\n\n\n<p class=\"wp-block-paragraph\">PR \u63d0\u4ea4\u540e\uff0c\u4f60\u7684\u8d21\u732e\u4e4b\u65c5\u5e76\u6ca1\u6709\u7ed3\u675f\u3002<\/p>\n\n\n\n<ol class=\"wp-block-list\">\n<li><strong>\u4ee3\u7801\u5ba1\u67e5 (Code Review)<\/strong>\uff1a\u9879\u76ee\u7ef4\u62a4\u8005\u6216\u5176\u4ed6\u8d21\u732e\u8005\u4f1a\u5ba1\u67e5\u4f60\u7684\u4ee3\u7801\uff0c\u5e76\u53ef\u80fd\u63d0\u51fa\u4fee\u6539\u610f\u89c1\u3002<\/li>\n\n\n\n<li><strong>\u54cd\u5e94\u4fee\u6539<\/strong>\uff1a\u6839\u636e\u53cd\u9988\uff0c\u5728\u4f60\u7684<strong>\u672c\u5730\u529f\u80fd\u5206\u652f<\/strong>\u4e0a\u7ee7\u7eed\u4fee\u6539\u3001\u63d0\u4ea4\uff0c\u5e76\u518d\u6b21\u63a8\u9001\u5230\u4f60\u7684\u8fdc\u7a0b\u5206\u652f\u3002<strong>PR \u4f1a\u81ea\u52a8\u66f4\u65b0<\/strong>\u3002<code># \u5728\u672c\u5730\u529f\u80fd\u5206\u652f\u4e0a\u4fee\u6539\u540e git add . \/ git commit -m \"fix: \u6839\u636ereview\u610f\u89c1\u4fee\u6539\u4e86xxx\" \/ git push origin feature\/\u4f60\u7684\u529f\u80fd\u63cf\u8ff0<\/code><\/li>\n\n\n\n<li><strong>\u5408\u5e76 (Merge)<\/strong>\uff1a\u5f53\u7ef4\u62a4\u8005\u5bf9\u4f60\u7684\u4ee3\u7801\u6ee1\u610f\u540e\uff0c\u4ed6\u4eec\u4f1a\u5c06\u5176\u5408\u5e76\u5230\u4e3b\u9879\u76ee\u4e2d\u3002<\/li>\n\n\n\n<li><strong>\u540c\u6b65\u66f4\u65b0<\/strong>\uff1aPR \u88ab\u5408\u5e76\u540e\uff0c\u4e3a\u4e86\u4fdd\u6301\u4f60\u7684 Fork \u4ed3\u5e93\u4e0e\u4e0a\u6e38\u4e00\u81f4\uff0c\u9700\u8981\u540c\u6b65\u66f4\u65b0\u3002<code>git checkout main \/ git fetch upstream \/ git rebase upstream\/main \/ git push origin main<\/code><\/li>\n<\/ol>\n\n\n\n<h3 class=\"wp-block-heading\">\u5220\u9664\u672c\u5730\u9057\u7559\u5f00\u53d1\u5206\u652f<\/h3>\n\n\n\n<p class=\"wp-block-paragraph\">\u5728\u5220\u9664\u672c\u5730 <code>dev<\/code> \u5206\u652f\u4e4b\u524d\uff0c<strong>\u52a1\u5fc5\u5148\u5207\u6362\u51fa <code>dev<\/code> \u5206\u652f<\/strong>\u3002\u4f60\u65e0\u6cd5\u5220\u9664\u5f53\u524d\u6b63\u5728\u4f7f\u7528\u7684\u5206\u652f\u3002<\/p>\n\n\n\n<pre class=\"wp-block-preformatted\">git checkout main<\/pre>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<ul class=\"wp-block-list\">\n<li><strong>\u5b89\u5168\u5220\u9664<\/strong>\uff08PR \u5df2\u5408\u5e76\uff0c\u6539\u52a8\u5df2\u5165\u5e93\uff09\uff1agit branch -d dev<\/li>\n\n\n\n<li><strong>\u5f3a\u5236\u5220\u9664<\/strong>\uff08PR \u88ab\u5173\u95ed\uff0c\u6539\u52a8\u4e0d\u6253\u7b97\u8981\u4e86\uff0c\u6216 <code>-d<\/code> \u62a5\u9519\u63d0\u793a\u672a\u5408\u5e76\uff09\uff1agit branch -D dev<\/li>\n<\/ul>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<p class=\"wp-block-paragraph\">\uff08\u5373\u5220\u9664\u4f60\u5728 GitHub\/Gitee \u4e0a Fork \u4ed3\u5e93\u91cc\u7684\u90a3\u4e2a <code>dev<\/code> \u5206\u652f\uff09<\/p>\n\n\n\n<pre class=\"wp-block-preformatted\">git push origin --delete dev<\/pre>\n\n\n\n<p class=\"wp-block-paragraph\">\u6267\u884c\u540e\uff0c\u53ef\u4ee5\u53bb GitHub \u4f60\u7684\u4ed3\u5e93\u9875\u9762\u5237\u65b0\u4e00\u4e0b\uff0c<code>dev<\/code> \u5206\u652f\u5e94\u8be5\u5c31\u6d88\u5931\u4e86\u3002<\/p>\n\n\n\n<h3 class=\"wp-block-heading\">git log\u4e3b\u8981\u7528\u6cd5<\/h3>\n\n\n\n<pre class=\"wp-block-preformatted\">git log --oneline --graph --decorate --all<\/pre>\n\n\n\n<p class=\"wp-block-paragraph\">\u53c2\u6570\u542b\u4e49\uff1a<\/p>\n\n\n\n<ul class=\"wp-block-list\">\n<li><code>--oneline<\/code>\uff1a\u6bcf\u4e2a\u63d0\u4ea4\u53ea\u663e\u793a\u4e00\u884c\uff0c\u7b80\u6d01\u3002<\/li>\n\n\n\n<li><code>--graph<\/code>\uff1a\u5de6\u4fa7\u7528 ASCII \u5b57\u7b26\u753b\u51fa\u5206\u652f\u5206\u53c9\u3001\u5408\u5e76\u7684\u56fe\u5f62\u3002<\/li>\n\n\n\n<li><code>--decorate<\/code>\uff1a\u663e\u793a\u5206\u652f\u540d\u3001\u6807\u7b7e\u3001<code>HEAD<\/code>\u3001<code>upstream\/main<\/code> \u7b49\u5f15\u7528\u3002<\/li>\n\n\n\n<li><code>--all<\/code>\uff1a\u663e\u793a\u6240\u6709\u5206\u652f\uff08\u5305\u62ec\u8fdc\u7a0b\u5206\u652f\uff09\u3002\u53ea\u770b\u5f53\u524d\u5206\u652f\u5c31\u53bb\u6389 <code>--all<\/code>\u3002<\/li>\n<\/ul>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u770b <code>dev<\/code> \u6bd4\u4e0a\u6e38\u591a\u4e86\u54ea\u4e9b\u63d0\u4ea4\uff1agit log --oneline upstream\/main..dev<\/li>\n\n\n\n<li>\u770b\u4e0a\u6e38\u6bd4 <code>dev<\/code> \u591a\u4e86\u54ea\u4e9b\u63d0\u4ea4\uff1agit log --oneline dev..upstream\/main<\/li>\n\n\n\n<li>\u53ea\u770b\u5206\u652f\u7ed3\u6784\uff0c\u5ffd\u7565\u7ec6\u8282\uff1agit log --oneline --graph --decorate --all --simplify-by-decoration<\/li>\n\n\n\n<li>\u770b\u67d0\u4e2a\u6587\u4ef6\u7684\u4fee\u6539\u5386\u53f2\uff1agit log --oneline --graph --follow -- \u6587\u4ef6\u540d<\/li>\n\n\n\n<li>\u663e\u793a\u6bcf\u6b21\u63d0\u4ea4\u6539\u4e86\u54ea\u4e9b\u6587\u4ef6\uff1agit log --stat --oneline --graph --decorate --all<\/li>\n<\/ul>\n\n\n\n<p class=\"wp-block-paragraph\">git pull --rebase origin [main]<\/p>\n\n\n\n<h3 class=\"wp-block-heading\">git show<\/h3>\n\n\n\n<p class=\"wp-block-paragraph\">\u6700\u5e38\u7528\u7684\u662f <code>git show<\/code>\uff1a<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>git show <commit><\/code><\/pre>\n\n\n\n<p class=\"wp-block-paragraph\">\u5b83\u4f1a\u663e\u793a\u8fd9\u4e2a commit \u7684\uff1ahash\u3001\u4f5c\u8005\u3001\u65e5\u671f\u3001\u63d0\u4ea4\u8bf4\u660e\uff0c\u4ee5\u53ca\u76f8\u5bf9\u7236\u63d0\u4ea4\u7684\u5177\u4f53\u4ee3\u7801\u6539\u52a8 diff\u3002<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"><code>&lt;commit&gt;<\/code> \u53ef\u4ee5\u5199\uff1a\u5b8c\u6574 hash\u3001\u77ed hash\u3001<code>HEAD<\/code>\u3001<code>HEAD~1<\/code>\u3001\u5206\u652f\u540d\u3001tag \u540d\u7b49\u3002<\/p>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<h4 class=\"wp-block-heading\">\u5e38\u7528\u67e5\u770b\u65b9\u5f0f<\/h4>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>1. \u770b\u5b8c\u6574\u4fe1\u606f + \u4ee3\u7801\u6539\u52a8<\/strong><\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>git show <commit><\/code><\/pre>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>2. \u53ea\u770b\u6539\u4e86\u54ea\u4e9b\u6587\u4ef6\u3001\u589e\u5220\u884c\u6570<\/strong><\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>git show --stat <commit><\/code><\/pre>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>3. \u53ea\u770b\u6539\u52a8\u6587\u4ef6\u540d<\/strong><\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>git show --name-only <commit><\/code><\/pre>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>4. \u770b\u6587\u4ef6\u6539\u52a8\u72b6\u6001\uff0c\u5982 A\/M\/D<\/strong><\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>git show --name-status <commit><\/code><\/pre>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>6. \u53ea\u770b\u67d0\u4e2a\u6587\u4ef6\u7684\u6539\u52a8<\/strong><\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>git show <commit> -- path\/to\/file<\/code><\/pre>\n\n\n\n<p class=\"wp-block-paragraph\">\u6ce8\u610f\u8def\u5f84\u4e00\u822c\u6309\u4ed3\u5e93\u6839\u76ee\u5f55\u5199\u3002<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>8. \u770b\u539f\u59cb commit \u5bf9\u8c61\u5185\u5bb9<\/strong><\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>git cat-file -p <commit><\/code><\/pre>\n\n\n\n<p class=\"wp-block-paragraph\">\u4f1a\u663e\u793a tree\u3001parent\u3001author\u3001committer\u3001\u63d0\u4ea4\u8bf4\u660e\u7b49\u539f\u59cb\u4fe1\u606f\u3002<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"><strong>10. \u770b\u8fd9\u4e2a commit \u5728\u54ea\u4e9b\u5206\u652f\/\u6807\u7b7e\u91cc<\/strong><\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>git branch -a --contains <commit>\ngit tag --contains <commit><\/code><\/pre>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<p class=\"wp-block-paragraph\">\u60f3\u770b\u6700\u8be6\u7ec6\u7684\u63d0\u4ea4\u4fe1\u606f + \u6587\u4ef6\u7edf\u8ba1 + diff\uff1a<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>git show --pretty=fuller --stat --patch <commit><\/code><\/pre>\n\n\n\n<p class=\"wp-block-paragraph\">\u5982\u679c\u8f93\u51fa\u592a\u957f\uff0c\u5148\u7528\uff1a<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>git show --stat a1b2c3d<\/code><\/pre>\n\n\n\n<p class=\"wp-block-paragraph\">\u770b\u6539\u4e86\u54ea\u4e9b\u6587\u4ef6\uff0c\u518d\u9488\u5bf9\u67d0\u4e2a\u6587\u4ef6\uff1a<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>git show a1b2c3d -- src\/main.js<\/code><\/pre>\n","protected":false},"excerpt":{"rendered":"<p>\u8fd9\u662f\u8d21\u732e\u4ee3\u7801\u7684\u6807\u51c6\u6d41\u7a0b\u3002 PR \u63d0\u4ea4\u540e\uff0c\u4f60\u7684\u8d21\u732e\u4e4b\u65c5\u5e76\u6ca1\u6709\u7ed3\u675f\u3002 \u5220\u9664\u672c\u5730\u9057\u7559\u5f00\u53d1\u5206\u652f \u5728\u5220\u9664\u672c\u5730 dev \u5206\u652f\u4e4b\u524d\uff0c\u52a1\u5fc5\u5148\u5207\u6362\u51fa &#8230;<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"emotion":"","emotion_color":"","title_style":"","license":"","footnotes":""},"categories":[2],"tags":[],"class_list":["post-170","post","type-post","status-publish","format-standard","hentry","category-tech"],"_links":{"self":[{"href":"https:\/\/blog.leawsic.ltd\/index.php\/wp-json\/wp\/v2\/posts\/170","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/blog.leawsic.ltd\/index.php\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/blog.leawsic.ltd\/index.php\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/blog.leawsic.ltd\/index.php\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/blog.leawsic.ltd\/index.php\/wp-json\/wp\/v2\/comments?post=170"}],"version-history":[{"count":4,"href":"https:\/\/blog.leawsic.ltd\/index.php\/wp-json\/wp\/v2\/posts\/170\/revisions"}],"predecessor-version":[{"id":175,"href":"https:\/\/blog.leawsic.ltd\/index.php\/wp-json\/wp\/v2\/posts\/170\/revisions\/175"}],"wp:attachment":[{"href":"https:\/\/blog.leawsic.ltd\/index.php\/wp-json\/wp\/v2\/media?parent=170"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/blog.leawsic.ltd\/index.php\/wp-json\/wp\/v2\/categories?post=170"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/blog.leawsic.ltd\/index.php\/wp-json\/wp\/v2\/tags?post=170"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}