{"id":6269,"date":"2017-12-17T22:17:59","date_gmt":"2017-12-17T14:17:59","guid":{"rendered":"https:\/\/sdeno.com:80\/?p=6269"},"modified":"2026-04-09T10:12:02","modified_gmt":"2026-04-09T02:12:02","slug":"git%e7%ac%94%e8%ae%b0","status":"publish","type":"post","link":"https:\/\/sdeno.com\/?p=6269","title":{"rendered":"git\u7b14\u8bb0"},"content":{"rendered":"<p><a href=\"https:\/\/sdeno.com\/wp-content\/uploads\/2017\/12\/git.txt\">git<\/a><\/p>\n<p>\u4ee5\u4e0b\u662f\u672c\u4eba\u5e38\u7528\u7684git\u547d\u4ee4\uff0cgit\u6709\u4e00\u4e2a\u4e0d\u660e\u6587\u7684\u89c4\u5b9a\u8981\u4e3a\u7b2c\u4e00\u6b21\u4f7f\u7528git\u7684\u4eba\u4ecb\u7ecd\u4e00\u4e0b\uff0c<\/p>\n<p><span style=\"color: #ff0000;\">master<\/span>\uff1a\u5206\u652f\u662f\u6b63\u5f0f\u4e0a\u7ebf\u7684\u5206\u652f\uff0cgit\u9ed8\u8ba4\u81ea\u52a8\u521b\u5efa\u3002\u4e00\u822c\u6211\u4eec\u6539\u4ee3\u7801\u662f\u4e0d\u4f1a\u5728\u6b64\u5730\u65b9\u6539\u7684\u3002<\/p>\n<p><span style=\"color: #ff0000;\">develop\/dev<\/span>\uff1a\u8fd9\u4e2a\u5206\u652f\u9700\u8981\u624b\u52a8\u521b\u5efa\uff0c\u4e00\u822c\u9879\u76ee\u90fd\u4f1a\u53d6\u8fd9\u4e2a\u540d\u5b57\uff0c\u8fd9\u4e2a\u662f\u5373\u5c06\u548cmaster\u5408\u5e76\u4e0a\u7ebf\u7684\u5206\u652f\uff0c\u4e5f\u5c31\u662f\u628a\u5176\u4ed6\u4eba\u5728\u5404\u81ea\u7684\u5206\u652f\u4e0b\u5b8c\u6210\u4e0d\u540c\u7684\u529f\u80fd\u7edf\u4e00\u5408\u5e76\u5230develop\/dev\u65f6\u3002\u6211\u4eec\u4e5f\u4e0d\u4f1a\u5728\u6b64\u5206\u652f\u4e0a\u76f4\u63a5\u4fee\u6539\u4ee3\u7801\u3002<\/p>\n<p><span style=\"color: #ff0000;\">\u81ea\u5b9a\u4e49\u5206\u652f<\/span>\uff1a\u8fd9\u4e2a\u5177\u4f53\u770b\u56e2\u961f\u7684\u8981\u6c42\uff0c\u4f8b\u5982\u6709\u4e9b\u56e2\u961f\u8981\u6c42\u662f\u8fd9\u6837\uff1a\bzhaosan\/images_upload\uff0c\u4e00\u773c\u5c31\u770b\u51fa\u662f\u5f20\u4e09\u7684\u4eba\u6b63\u5728\u5f00\u53d1\u4e00\u4e2a\u56fe\u7247\u4e0a\u4f20\u7684\u529f\u80fd\u3002<\/p>\n<pre>\/\/\u67e5\u770b\u5f53\u524d\u9879\u76ee\u72b6\u6001\u770b\u770b\u6709\u6ca1\u6709\u4fee\u6539\u6216\u8005\u51b2\u7a81\u7684\r\ngit status\r\n\r\n1\uff0cnothing to commit, working tree clean\r\n\u4ee3\u7801\u6ca1\u6709\u4fee\u6539\u548c\u51b2\u7a81\r\n\r\n\r\n2\uff0c\r\nmodified \/\/\u4ee3\u7801\u6709\u8fc7\u4fee\u6539\r\nboth \/\/\u4ee3\u7801\u6709\u51b2\u7a81\r\ndeleted by them: www-v2\/common.css  \/\/\u670d\u52a1\u5668\u4e0a\u6ca1\u6709\u8fd9\u4e2a\u6587\u4ef6\uff0c\u4f60\u672c\u5730\u5374\u6709\r\n\r\n\r\n\u6709\u51b2\u7a81\u4ee3\u7801\u4e00\u822c\u90fd\u4f1a\u6709\u8fd9\u6837\u7b26\u53f7\r\n&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD\r\n\u6211\u7684\u4ee3\u7801\r\n======= \r\n\u5408\u5e76\u8fc7\u6765\u522b\u4eba\u7684\u4ee3\u7801\r\n&gt;&gt;&gt;&gt;&gt;&gt;&gt; feature1\r\n\r\n\r\n\u89e3\u51b3\u5b8c\u51b2\u7a81\u540e\uff0c\u518d\u6b21\u68c0\u67e5\u662f\u5426\u6709\u9057\u6f0f\u7684\r\ngit diff --check\r\n\r\n\/\/\u4ee5\u4e0b\u63d0\u4ea4\u4ee3\u7801\u6d41\u7a0b\r\ngit add .\r\ngit commit -m \"\u6ce8\u91ca\" \r\ngit pull\r\ngit status\r\ngit push\r\ngit push -f  \/\/\u5f3a\u5236\u66f4\u65b0\u3002\u4f8b\u5982\u56de\u5f52\u52302018.1.1\u7684\u5206\u652f\uff0c\u5f3a\u5236\u66f4\u65b0\u540e\u3002\b\u57281.1\u4e4b\u540e\u7684\u4fee\u6539\u670d\u52a1\u5668\u4e0a\u5168\u6ca1\u4e86\u3002\u8c28\u7528\uff01\r\n\r\n\r\n\/\/\u67e5\u770b\u589e\u3001\u5220\u4e86\u54ea\u4e9b\u4ee3\u7801\r\ngit diff resources\/views\/www-v2\/home\/index.blade.php\r\n\r\n\r\n\/\/\u67e5\u770b\u672c\u5730\u5206\u652f\r\ngit branch\r\n\r\n\/\/\u67e5\u770b\u672c\u5730\u548c\u8fdc\u7a0b\r\ngit branch -a (\u4e4b\u524d\u9700\u8981git pull \u66f4\u65b0)\r\n\r\n\/\/\u5f3a\u5236\u66f4\u65b0\u4e0d\u7ba1\u5bf9\u9519\r\ngit add . &amp;&amp; git commit --no-verify -m \"\u4ee3\u7801\u89c4\u8303\u5f3a\u5236\u63d0\u4ea4\u6d4b\u8bd5\"\r\n\r\n\/\/\u521b\u5efa\u4e00\u4e2a\u5206\u652f\r\ngit branch xx (\u5728\u6b64\u4e4b\u524d\u6700\u597dgit branch\u4e00\u4e0b\u770b\u770b\u5206\u652f\u547d\u540d\u6709\u6ca1\u6709\u4ec0\u4e48\u89c4\u5219\uff0c\u6309\u89c4\u5219\u6765)\r\ngit checkout -b xx  \/\/git branch xx  \u4e14  git checkout xx \uff0c\u65b0\u5efa\u5e76\u5207\u6362xx\u5206\u652f\r\n\r\n\/\/\u63d0\u4ea4\u65b0\u5206\u652f\r\n1\uff0c\u5148\u5207\u6362\u5230\u521a\u521a\u521b\u5efa\u7684\u5206\u652fgit checkout feature\/ceshi\r\n2\uff0cgit push \uff08\u4e00\u822c\u4f1a\u6709\u63d0\u793a\uff09\r\n3\uff0cgit push --set-upstream origin feature\/ceshi\r\n\u4e4b\u540e\u65b0\u5206\u652f\u5c31\u63d0\u4ea4\u5230\u4e86\u670d\u52a1\u5668\u4e0a\u4e86\r\n\r\n\u5408\u5e76\uff0c\u5e0c\u671b\u57fa\u4e8edevelop\u4e0e\u5f53\u524d\u5206\u652f\u5408\u5e76\u3002\r\n1\uff0c\u5148git checkout develop\u5207\u6362\u5230develop\u5206\u652f\r\n2\uff0cgit pull\u66f4\u65b0\u4e00\u4e0bdevelop\u5206\u652f\r\n3\uff0cgit checkout feature\/ceshi\u5207\u56de\u5f53\u524d\u5206\u652f\r\n4\uff0cgit merge develop \uff0c\u5f53\u524d\u5206\u652f\u548cdevelop\u5206\u652f\u5408\u5e76\r\n5\uff0cgit status \u770b\u770b\u6709\u6ca1\u6709\u5f02\u5e38\r\n\r\n\r\n\u7248\u672c\u9000\u56de\r\ngit reflog \/\/\u5148\u67e5\u770b\u5df2\u7ecfcommit\u7684\u7248\u672c\u83b7\u53d6\u5230commit id\r\ngit reset --hard 3628164<\/pre>\n<p><span style=\"color: #ff0000;\">\u8ba9git\u5ffd\u7565\u6587\u4ef6<\/span><\/p>\n<p>\u5728\u6839\u76ee\u5f55\u4e0b\u65b0\u5efa.gitignore\uff0c\u4ee5\u4e0b\u5185\u5bb9\u5747\u88abgit\u5ffd\u7565\u4e0d\u63d0\u4ea4\u3002<\/p>\n<pre>.svn\/\r\n.settings\/\r\n*.project\r\ntarget\r\nrebel.xml\r\nhsf.lock\r\n\r\nHELP.md\r\ntarget\/\r\n!.mvn\/wrapper\/maven-wrapper.jar\r\n!**\/src\/main\/**\/target\/\r\n!**\/src\/test\/**\/target\/\r\n\r\n\/vendor\r\n\/node_modules\r\n.env\r\n\r\n### STS ###\r\n.apt_generated\r\n.classpath\r\n.factorypath\r\n.project\r\n.settings\r\n.springBeans\r\n.sts4-cache\r\n\r\n### IntelliJ IDEA ###\r\n.idea\r\n*.iws\r\n*.iml\r\n*.ipr\r\n\r\n### NetBeans ###\r\n\/nbproject\/private\/\r\n\/nbbuild\/\r\n\/dist\/\r\n\/nbdist\/\r\n\/.nb-gradle\/\r\nbuild\/\r\n!**\/src\/main\/**\/build\/\r\n!**\/src\/test\/**\/build\/\r\n\r\n### VS Code ###\r\n.vscode\/<\/pre>\n<p>&nbsp;<\/p>\n<p><span style=\"color: #ff0000;\">\u672c\u5730\u4fee\u6539\u6587\u4ef6\u5ffd\u7565\u5176\u4fee\u6539\u5185\u5bb9\u8ba9git status\u8ddf\u8e2a\u4e0d\u5230<\/span><\/p>\n<p>\u65b9\u6cd5\u4e00\uff1a<\/p>\n<pre class=\"EnlighterJSRAW\" data-enlighter-language=\"generic\">git update-index --assume-unchanged \"\/root\/dev.yml\" \/\/git\u5173\u95ed\u8ddf\u8e2a\u6587\u4ef6\u4fee\u6539\u63d0\u4ea4\r\ngit update-index --no-assume-unchanged \"\/root\/dev.yml\"\/\/git\u6253\u5f00\u8ddf\u8e2a\u6587\u4ef6\u4fee\u6539\u63d0\u4ea4\r\n\r\ngit ls-files -v | grep \"^h\" \/\/\u67e5\u770b\u54ea\u4e9b\u6587\u4ef6\u88ab\u5ffd\u7565<\/pre>\n<p>&nbsp;<\/p>\n<p>\u65b9\u6cd5\u4e8c\uff1a<\/p>\n<p>\u7f16\u8f91.git\/info\/exclude\u6587\u4ef6<\/p>\n<pre class=\"EnlighterJSRAW\" data-enlighter-language=\"generic\"># \u5ffd\u7565\u7279\u5b9a\u7684\u6587\u4ef6\r\nmy_password.txt\r\nconfig\/local_config.json\r\n\r\n# \u5ffd\u7565\u6574\u4e2a\u6587\u4ef6\u5939\uff08\u8bb0\u5f97\u52a0\u659c\u6760\uff09\r\ntemp_logs\/\r\nbin\/\r\n\r\n# \u5ffd\u7565\u6240\u6709 .mp4 \u7ed3\u5c3e\u7684\u6587\u4ef6\r\n*.mp4\r\n\r\n# \u4f46\u4e0d\u5ffd\u7565\u7279\u5b9a\u7684\u67d0\u4e2a .mp4 \u6587\u4ef6\r\n!important_guide.mp4<\/pre>\n<p>&nbsp;<\/p>\n<p>&nbsp;<\/p>\n<p>\u65b9\u6cd5\u4e09\uff1a<\/p>\n<p>\u521a\u521a\u4e0b\u8f7d\u7684\u9879\u76eegit\u4e00\u822c\u90fd\u8fd8\u4e0d\u4f1a\u8ddf\u8e2a\u65b0\u52a0\u7684\u6587\u4ef6\uff0c\u76f4\u63a5\u53bb.gitignore\u91cc\u9762\u8ffd\u52a0\u5ffd\u7565\u7684\u6587\u4ef6\u5373\u53ef\u3002<\/p>\n<p>\u67e5\u770b\u6587\u4ef6\u662f\u5426\u88ab\u8ddf\u8e2a\u4f7f\u7528git ls-files\uff0c\u5982\u679c\u4f60\u60f3\u5ffd\u7565\u7684\u6587\u4ef6\u6709\u5728\u91cc\u9762\uff0c\u8fd8\u5728.gitignore\u8ffd\u52a0\u662f\u6ca1\u6548\u679c\u7684\uff0c<\/p>\n<p>\u5728\u8ddf\u8e2a\u5217\u8868\u4e2d\u5220\u9664\u6587\u4ef6\u5982\uff1a<\/p>\n<pre class=\"EnlighterJSRAW\" data-enlighter-language=\"generic\">git rm --cached .nvmdrc\u00a0 \/\/\u5728\u9879\u76ee\u8ddf\u76ee\u5f55\u5220\u9664\u8ddf\u8e2a\u7684.nvmdrc\u6587\u4ef6\r\ngit rm --cached subdir\/.nvmdrc\u00a0 \/\/\u5982\u679c\u662f\u5728\u76ee\u5f55subdir\u91cc\u9762\u5220\u9664\u8ddf\u8e2a\u7684.nvmdrc\u6587\u4ef6\r\n\u7136\u540e\u5728\u628a.nvmdrc\u6587\u4ef6\u8ffd\u52a0\u5230.gitignore\r\n\u6d4b\u8bd5\u4e0b\u4fee\u6539.nvmdrc\u6587\u4ef6git status\u80fd\u5426\u8fd8\u88ab\u8ddf\u8e2a<\/pre>\n<p>&nbsp;<\/p>\n<p>\u5982\u679c\u6587\u4ef6\u66fe\u7ecf\u88ab Git \u8ddf\u8e2a\uff0c\u4f46\u5df2\u7ecf\u88ab\u5220\u9664\uff0cGit \u4ecd\u7136\u4f1a\u4fdd\u7559\u5176\u8bb0\u5f55\u3002\u4f60\u53ef\u4ee5\u901a\u8fc7\u4ee5\u4e0b\u547d\u4ee4\u6e05\u7406 Git \u7684\u7f13\u5b58\uff1a<\/p>\n<pre class=\"EnlighterJSRAW\" data-enlighter-language=\"generic\">git rm --cached -r .\r\ngit add .<\/pre>\n<p>&nbsp;<\/p>\n<p>&nbsp;<\/p>\n<p><span style=\"color: #ff0000;\">\u57fa\u672c\u6848\u4f8b<\/span><\/p>\n<pre>\/\/\u521d\u59cb\u5316\u4e00\u4e2a\u7a7a\u767d\u4ed3\u5e93\r\ngit init \r\n\r\ngit config user.name \"\u4f5c\u8005\u6635\u79f0\"\r\ngit config user.email \"chenge@chinaesport.com\"\r\n\/\/\u7ed9\u672c\u5730\u4ed3\u5e93\u8bbe\u7f6e\u4e00\u4e2a\u8fdc\u7a0b\u4e0a\u4f20\u3001\u4e0b\u8f7d\u5730\u5740\u503c\u662fgit@xxx.git\uff0c\u8d4b\u503c\u5230\u4e00\u4e2a\u53d8\u91cf\u540d\u4e3aorigin\uff0c\uff08\u9ed8\u8ba4\u90fd\u662forigin\u4e0d\u63a8\u8350\u4e71\u53d6\u540d\uff09\r\ngit remote add origin git@gitee.com:chen77134056\/vuelic3.git  \r\n\r\n\/\/\u5c06\u672c\u5730\u4ee3\u7801\u63d0\u4ea4\u4e0a\u8fdc\u7a0b\u670d\u52a1\u5e76\u5173\u8054\u5206\u652f\uff0c\u672c\u5730\u548c\u8fdc\u7a0b\u5206\u652f\u90fd\u662fmaster\u540d\u5b57\r\ngit push --set-upstream origin master\r\n\r\n\r\n\/\/\u901a\u8fc7\u8bbe\u7f6e\u597d\u7684\u8fdc\u7a0b\u4ed3\u5e93,\u4e0b\u8f7d\u8fdc\u7a0b\u4ed3\u5e93\u7684\u5185\u5bb9,\u4f46\u662f\u8fd9\u4e2a\u547d\u4ee4\u4e0d\u4f1a\u5e2e\u6211\u4eec\u5408\u5e76\u4ee3\u7801\r\ngit fetch\r\n\r\n\/\/\u5c06\u672c\u5730\u5206\u652fmaster\u4e0e\u8fdc\u7a0b\u4ed3\u5e93\u5206\u652f\u5173\u8054\u5230\u4e00\u8d77\uff0c\u8fd9\u6837\u624d\u80fdgit push\uff08\u63a8\u8350\u672c\u5730\u5206\u652f\u53d6\u540d\u548c\u8fdc\u7a0b\u5206\u652f\u53d6\u540d\u4e00\u6837\uff09\r\ngit branch master origin\/master\r\n\r\n\/\/\u73b0\u5728\u5207\u6362master\u5206\u652f\r\ngit checkout master\r\n\r\n\/\/\u4e0b\u8f7d\u8fdc\u7a0b\u4ed3\u5e93\u7684\u5185\u5bb9\uff0c\u4f1a\u628a\u6211\u4eec\u81ea\u5df1\u4ee3\u7801\u548c\u8fdc\u7a0b\u4ee3\u7801\u5408\u5e76\u5728\u4e00\u8d77\r\ngit pull<\/pre>\n<p>\u5206\u5e03\u5f0f\u7248\u672c\u63a7\u5236\u7cfb\u7edf<\/p>\n<p>\u597d\u5904\uff1a<br \/>\n1\uff0c\u8bb0\u5f55\u6bcf\u6b21\u6539\u52a8\u65f6\u95f4<br \/>\n2\uff0c\u591a\u4eba\u534f\u4f5c\u540c\u4e00\u4e2a\u9879\u76ee<br \/>\n3\uff0c\u53ef\u4ee5\u6062\u590d\u6307\u5b9a\u67d0\u4e00\u4e2a\u65f6\u95f4\u70b9\u7684\u6587\u4ef6<br \/>\n4\uff0c\u81ea\u5df1\u7535\u8111\u6c38\u8fdc\u662f\u6700\u65b0\uff0c\u4fee\u6539\u65f6\u76f4\u63a5\u6539\uff0c\u4e0d\u9700\u8981\u4ece\u7c7b\u4f3c\u4e2d\u592e\u670d\u52a1\u5668\u5148\u66f4\u65b0\u5728\u6539<br \/>\n5\uff0c\u5f3a\u5927\u5206\u652f\u7ba1\u7406\uff08\u8fdc\u8fdc\u628asvn\u629b\u5728\u540e\u9762\uff09<\/p>\n<p>\u5386\u53f2\uff1a<br \/>\ngit\u662flinux\u7684\u521b\u59cb\u4eba\u5199\u7684<\/p>\n<p>\u6bd4\u8f83\uff1a<br \/>\nsvn\u548cgit\u6bd4\u8f83<br \/>\nsvn\u9700\u8981\u7c7b\u4f3c\u4e2d\u592e\u670d\u52a1\u5668\uff0c\u8981\u5728\u81ea\u5df1\u7535\u8111\u4fee\u6539\u65f6\uff0c\u5148\u4ece\u4e2d\u592e\u670d\u52a1\u5668\u66f4\u65b0\u624d\u80fd\u4fee\u6539\uff0c<br \/>\n\u6240\u4ee5\u524d\u63d0\u662f\u9700\u8981\u8054\u7f51\u540e\u624d\u80fd\u7ee7\u7eed\u5de5\u4f5c\u3002<\/p>\n<p>git\u4e0d\u9700\u8981\u8054\u7f51\u5c31\u80fd\u5de5\u4f5c\uff0c\u4e0d\u9700\u8981\u4e2d\u592e\u670d\u52a1\u5668\uff0c\u81ea\u5df1\u672c\u673a\u4e0a\u7684\u6587\u4ef6\u6700\u65b0\u7684\uff0c\u65ad\u7f51\u53ef\u4ee5\u7ee7\u7eed\u5de5\u4f5c\u3002<br \/>\n\u591a\u4e2a\u7528\u6237\u4fee\u6539\u540c\u4e00\u4e2a\u6587\u4ef6\uff0c\u53ea\u9700\u8981\u628a\u81ea\u5df1\u4fee\u6539\u7684\u90e8\u5206\u63a8\u9001\u7ed9\u5bf9\u65b9\u5373\u53ef\uff0c\u8fd9\u6837\u6bcf\u4e2a\u4eba\u7535\u8111\u53c8\u90fd\u662f\u6700\u65b0\u7684\u4e86\u3002<\/p>\n<p>\u5b89\u5168\u6027\uff1a<br \/>\ngit\u6ca1\u6709\u4e2d\u592e\u670d\u52a1\u5668\u5c31\u4e0d\u6015\u9ed1\u5ba2\u653b\u51fb\uff0c\u5c31\u7b97\u67d0\u4e2a\u7528\u6237\u88ab\u9ed1\u4e86\uff0c\u4ee3\u7801\u53ef\u4ee5\u5728\u4ece\u5176\u4ed6\u4eba\u7535\u8111\u83b7\u53d6\u6700\u65b0\u7684\u3002<\/p>\n<p>\u5f25\u8865\u4e0d\u8db3\uff1a<br \/>\n\u4e4b\u524d\u8bf4\u4e86\u8981\u4fdd\u8bc1\u5927\u5bb6\u7684\u6587\u4ef6\u4fdd\u6301\u6700\u65b0\u7684\u5c31\u8981\u5927\u5bb6\u540c\u65f6\u5728\u7ebf\u63a8\u9001\u81ea\u5df1\u4fee\u6539\u7684\u90e8\u5206\u7ed9\u5176\u4ed6\u4eba\uff0c\u5728\u5b9e\u9645\u4e2d\u4e0d\u73b0\u5b9e<br \/>\n\u4e3a\u4e86\u65b9\u4fbf\u5927\u5bb6\u63a8\u9001\u81ea\u5df1\u4fee\u6539\u7684\u90e8\u5206\u7ed9\u5176\u4ed6\u4eba\uff0c\u8fd8\u662f\u9700\u8981\u4e00\u4e2a\u201c\u4e2d\u592e\u670d\u52a1\u5668\u201d\uff0c\u8fd9\u91cc\u7684\u201c\u4e2d\u592e\u670d\u52a1\u5668\u201d<br \/>\n\u4ec5\u4ec5\u662f\u65b9\u4fbf\u5927\u5bb6\u4ea4\u6362\u81ea\u5df1\u4fee\u6539\u7684\u90e8\u5206\u800c\u5df2\uff0c\u6ca1\u5b83\u6211\u4eec\u53ef\u4ee5\u7167\u6837\u5de5\u4f5c\u3002<\/p>\n<p>\u5f00\u59cb\u6559\u7a0b\uff1a<br \/>\n(\u58f0\u660e\u56fe\u7247\u3001\u89c6\u9891\u3001Microsoft\u7684Word\u683c\u5f0f\uff0c git\u53ea\u80fd\u77e5\u9053\u53d8\u5316\u5927\u5c0f\uff0c\u4e0d\u77e5\u9053\u5177\u4f53\u6539\u53d8\u4e86\u4ec0\u4e48)<br \/>\n\u6ce8\u610f\uff1a\u4e0d\u8981\u4f7f\u7528Windows\u81ea\u5e26\u7684\u8bb0\u4e8b\u672c\u7f16\u8f91\u4efb\u4f55\u6587\u672c\u6587\u4ef6\u3002<\/p>\n<p>\u521b\u5efa\u7248\u672c\u5e93\u53c8\u540d\u4ed3\u5e93\uff1a<br \/>\ngit init<\/p>\n<p><span style=\"color: #ff0000;\">\u589e\uff1a<\/span><br \/>\ngit add file1.txt \/\/\u63d0\u4ea4\u5355\u4e2a<br \/>\ngit add file2.txt file3.txt \/\/\u63d0\u4ea4\u591a\u4e2a<br \/>\ngit status \/\/\u6700\u540e\u67e5\u770b\u6709\u4ec0\u4e48\u4fee\u6539\u53c8\u6f0f\u4e86add\u63d0\u4ea4\u7684<br \/>\ngit commit -m &#8220;\u5199\u70b9\u6709\u610f\u4e49\u7684\u6ce8\u91ca&#8221; \/\/\u4e00\u6b21\u6027\u63d0\u4ea4\u4e4b\u524dadd\u7684\u6587\u4ef6\u5230\u4ed3\u5e93\uff0c\u5982\u679c\u4fee\u6539\u6587\u4ef6\u540e\u6ca1add,\u5c31\u7b97commit\u4e5f\u4e0d\u4f1a\u63d0\u4ea4\u6210\u529f\u7684<\/p>\n<p>git branch xx \/\/\u521b\u5efa\u4e00\u4e2axx\u5206\u652f<\/p>\n<p>git merge xx \/\/\u5c06xx\u5206\u652f\u548c\u5f53\u524d\u5206\u652f\u5408\u5e76 \uff08\u5c06\u5f53\u524d\u5206\u652f\u7684\u4ee3\u7801\u548cxx\u5206\u652f\u7684\u4ee3\u7801\u5408\u5e76\uff09<br \/>\ngit merge &#8211;no-ff -m &#8220;\u6ce8\u91ca&#8221; xx \/\/\u5408\u5e76\uff0c\u7981\u7528Fast forward\u6a21\u5f0f\uff0c\u53ef\u4ee5\u770b\u51fa\u5408\u5e76\u5386\u53f2<\/p>\n<p>git stash \/\/\u5b58\u50a8\u6b63\u5728\u5de5\u4f5c\u8fd8\u6ca1\u5b8c\u6210\u7684\u9879\u76ee\uff08\u76ee\u7684\u662f\u53e6\u4e00\u4e2abug\u66f4\u6025\u7740\u53bb\u4fee\u6539\uff09<br \/>\n\/\/\u5982\u679c\u5f53\u524d\u5de5\u4f5c\u7684\u5206\u652f\u662fdev<br \/>\n\/\/\u4f7f\u7528git stash\u628a\u672a\u5b8c\u6210\u7684dev\u5206\u652f\u5de5\u4f5c\u8fdb\u5ea6\u4fdd\u5b58\uff0c\u53bb\u4fee\u6539\u5176\u4ed6\u5206\u652fbug<br \/>\n\/\/\u5982\u679c\u5176\u4ed6\u5206\u652fbug\u4fee\u6539\u5b8c\u6210\uff0c\u5207\u56dedev\u5206\u652fgit checkout dev<br \/>\n\/\/\u4f7f\u7528git stash pop\u5207\u56dedev\u4e4b\u524d\u7684\u5de5\u4f5c\u8fdb\u5ea6\u5e76\u5220\u9664\u4e4b\u524d\u7684git stash\u5386\u53f2\u8bb0\u5f55<\/p>\n<p>git push origin master \/\/\u5c06\u672c\u5730master\u63a8\u9001\u5230\u8fdc\u7a0bmaster\u3002\u63a8\u9001\u5176\u4ed6\u5206\u652fgit push origin xx<\/p>\n<p>git push origin v1.0 \/\/\u63a8\u9001\u6307\u5b9a\u6807\u7b7e\u540d\u5230\u8fdc\u7a0b<br \/>\ngit push origin &#8211;tags \/\/\u63a8\u9001\u6240\u6709\u5df2\u7ecf\u8bbe\u7f6e\u6807\u7b7e\u540d\u5230\u8fdc\u7a0b<\/p>\n<p>git add -f App.class \/\/\u5f3a\u5236\u6dfb\u52a0\u6587\u4ef6\u5230\u6682\u5b58\u533a\uff0c\u9488\u5bf9.gitignore\u8bbe\u7f6e<\/p>\n<p>git fetch &lt;\u8fdc\u7a0b\u4e3b\u673a\u540d&gt; &lt;\u5206\u652f\u540d&gt;\u00a0 \u00a0\/\/\u53d6\u56de\u8fdc\u7a0b\u4ed3\u5e93\u7684\u8d44\u6e90\uff0c\u7c7b\u4f3c\u4e0b\u8f7d\uff0c\u5982\u679c\u60f3\u53d6\u56de\u53d6\u56deorigin\u4e3b\u673a\u7684master\u5206\u652f<br \/>\n\/\/\u5c31\u4f8b\u5982\uff1agit fetch origin master<\/p>\n<p><span style=\"color: #ff0000;\">\u5220\uff1a<\/span><br \/>\ngit rm test.txt \/\/\u5220\u9664\uff08\u5176\u5b9e\u8fd8\u6ca1\u6709\u771f\u6b63\u5220\u9664\uff0c\u64a4\u56de\u4e4b\u524d\u7684\u5220\u9664git checkout &#8212; test.txt\uff09<br \/>\ngit commit -m &#8220;remove test.txt&#8221; \/\/\u771f\u6b63\u7684\u4ece\u4ed3\u5e93\u4e2d\u5220\u9664<\/p>\n<p>git branch -d xx \/\/\u5220\u9664\u672c\u5730xx\u5206\u652f<br \/>\ngit branch -D xx \/\/\u5f3a\u884c\u5220\u9664\u6ca1\u6709\u5408\u5e76\u7684\u5206\u652f<\/p>\n<p>git tag -d v0.1 \/\/\u5220\u9664\u67d0\u4e2a\u5199\u9519\u7684\u6807\u7b7e\u540d<\/p>\n<p>\u5982\u679c\u4e0a\u4f20\u9519\u8bef\u7684\u6807\u7b7e\u540d\u5220\u9664\u987a\u5e8f\u662f\uff1a<br \/>\ngit tag -d v0.9 \/\/\u5148\u5220\u9664\u672c\u5730\u6807\u7b7e\u540d<br \/>\ngit push origin :refs\/tags\/v0.9 \/\/\u5148\u5220\u9664\u8fdc\u7a0b\u6807\u7b7e\u540d<\/p>\n<p>git remote rm &lt;\u4e3b\u673a\u540d&gt;\u00a0 \/\/\u5220\u9664\u8fdc\u7a0b\u4e3b\u673a<\/p>\n<p>git push origin &#8211;delete xx\u00a0 \u00a0\/\/\u5220\u9664\u8fdc\u7a0bxx\u5206\u652f<\/p>\n<p><span style=\"color: #ff0000;\">\u6539\uff1a<\/span><\/p>\n<pre class=\"EnlighterJSRAW\" data-enlighter-language=\"generic\">git reset --hard HEAD^\u00a0 \u00a0 \/\/\u9000\u56de\u4e00\u4e2a\u7248\u672c\uff0c\u5982\u679c\u53d1\u73b0\u51fa\u73b0\u6709more\u9519\u8bef\u53ef\u4ee5\u8fd9\u4e48\u6539\u00a0 \u00a0git reset --hard \"HEAD^\"\r\ngit reset --hard HEAD^^ \/\/\u9000\u56de\u4e0a\u4e0a\u4e00\u4e2a\u7248\u672c\r\ngit reset --hard HEAD~100 \/\/\u9000\u56de\u5230\u4e0a\u7b2c100\u4e2a\u7248\u672c\r\ngit reset --hard 3628164 \/\/\u5207\u6362\u5230\u5e95\u6307\u5b9a\u7248\u672c<\/pre>\n<p>git checkout &#8212; readme1.txt readme2.txt \/\/\u672agit add\uff0c\u6062\u590d\u4fee\u6539\u524d\uff0c<br \/>\n\u60c5\u51b51\uff0c\u5982\u679c\u6ca1add\uff0c\u5c31\u9000\u56de\u5230\u6700\u8fd1\u7684\u4e00\u6b21\u7248\u672c\uff08\u6700\u8fd1\u7684\u4e00\u6b21git commit\uff09<br \/>\n\u60c5\u51b52\uff0c\u5982\u679c\u6709add\uff0c\u5c31\u9000\u56de\u5230\u6700\u8fd1\u7684\u90a3\u6b21add\u5230\u6682\u5b58\u533a\u7684\u7248\u672c\uff08\u6700\u8fd1\u7684\u4e00\u6b21git add\uff09<\/p>\n<p>\u64a4\u56de\u9047\u5230\u60c5\u51b51\u8fd8\u597d\uff0c\u5982\u679c\u9047\u5230\u60c5\u51b52\uff0c\u8981\u600e\u4e48\u64a4\u56deadd\u5462\uff1f<br \/>\ngit reset HEAD readme.txt<br \/>\n\u63a5\u7740<br \/>\ngit checkout &#8212; readme.txt<br \/>\n\u4e4b\u524d\u63d0\u4ea4\u5230\u4fee\u6539\u7684\u5e76\u4e14\u63d0\u4ea4\u5230\u6682\u5b58\u533a\u7684\u5168\u90e8\u9000\u56de\u5230\u6700\u8fd1\u4e00\u6b21\u7248\u672c\uff0c\u9000\u56de\u5230\u6700\u8fd1\u7684\u4e00\u6b21git commit<\/p>\n<p>git checkout master \/\/\u5207\u6362\u6307\u5b9a\u5206\u652f<\/p>\n<p>git merge xx \/\/\u5c06xx\u5206\u652f\u548c\u5f53\u524d\u5206\u652f\u5408\u5e76 \uff08\u5982\u679c\u5f53\u524d\u5207\u6362\u5230master\u5206\u652f\u4f7f\u7528\u6b64\u547d\u4ee4\uff0c\u5c31\u662f\u628axx\u5206\u652f\u548cmaster\u5206\u652f\u5408\u5e76\uff09<\/p>\n<p>git stash apply stash@{0} \/\/\u6211\u4eec\u53ef\u4ee5\u591a\u6b21\u4f7f\u7528git stash\uff0c\u8981\u6062\u590d\u6307\u5b9a\u5386\u53f2\u8bb0\u5f55\u4f7f\u7528git stash list<\/p>\n<p>git tag v1.0 \/\/\u4e3a\u67d0commit id\u8bbe\u7f6e\u6807\u7b7e\u540d\uff0c\u5c31\u8981\u5148\u5207\u6362\u5230\u5230\u67d0\u6807\u7b7egit checkout<\/p>\n<p>git tag v0.9 6224937 \/\/\u4e3a\u67d0\u5177\u4f53commit id\u8bbe\u7f6e\u6807\u7b7e\u540d<br \/>\ngit tag -a v0.1 -m &#8220;\u6ce8\u91ca&#8221; 3628164 \/\/\u4e3a\u67d0commit id\u8bbe\u7f6e\u6807\u7b7e\u540d\u540c\u65f6\u8bbe\u7f6e\u6ce8\u91ca<\/p>\n<p>git remote rename &lt;\u539f\u4e3b\u673a\u540d&gt; &lt;\u65b0\u4e3b\u673a\u540d&gt;\u00a0 \u00a0\/\/\u4fee\u6539\u8fdc\u7a0b\u4e3b\u673a\u540d<\/p>\n<p>git pull origin next:master\u00a0 \u00a0\/\/\u8fdc\u7a0b\u7684\u5206\u652fnext\u4e0e\u672c\u5730\u7684\u5206\u652fmaster\u5408\u5e76<\/p>\n<p>git reset HEAD \/\/ \u64a4\u9500\u6240\u6709git add .\u63d0\u4ea4\u7684\u6587\u4ef6<\/p>\n<p>git reset HEAD XXX\/XXX\/XXX.java\u00a0 \/\/\u64a4\u9500\u67d0\u4e00\u4e2a git add \u7684\u6587\u4ef6<\/p>\n<pre class=\"EnlighterJSRAW\" data-enlighter-language=\"generic\">git config --global user.name \"\u4f60\u7684\u540d\u5b57\"\u00a0 \/\/push\u63d0\u4ea4\u4ee3\u7801\u663e\u793a\u8fd9\u91cc\u7684\u540d\u79f0\r\ngit config --global user.email \"\u4f60\u7684\u90ae\u7bb1\"<\/pre>\n<p>&nbsp;<\/p>\n<p>&nbsp;<\/p>\n<p>&nbsp;<\/p>\n<p><span style=\"color: #ff0000;\">\u67e5\uff1a<\/span><\/p>\n<p>\u51b2\u7a81\u5206\u6790\uff1a<\/p>\n<figure class=\"mdx-lazyload-container\" style=\"max-width:432px\"><div style=\"padding-top:70.37037037037%\"><\/div><div class=\"mdx-img-loading-sp mdui-valign\"><div><div class=\"mdui-spinner\"><\/div><\/div><\/div><img width=\"432\" height=\"304\" class=\"alignnone size-full wp-image-9285 lazyload\" title=\"git\u7b14\u8bb0\" src=\"data:image\/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==\" data-src=\"https:\/\/sdeno.com\/wp-content\/uploads\/2017\/12\/git20230411102149.png\" alt=\"https:\/\/sdeno.com\/wp-content\/uploads\/2017\/12\/git20230411102149.png\" data-srcset=\"https:\/\/sdeno.com\/wp-content\/uploads\/2017\/12\/git20230411102149.png 432w, https:\/\/sdeno.com\/wp-content\/uploads\/2017\/12\/git20230411102149-300x211.png 300w\" sizes=\"auto, (max-width: 432px) 100vw, 432px\"><\/figure>\n<p>git status \/\/\u67e5\u770b\u5f53\u524d\u4ed3\u5e93\u7684\u6587\u4ef6\u662f\u5426\u4fee\u6539\u3001\u6216\u672a\u63d0\u4ea4\u7684<\/p>\n<p>git diff HEAD \u6587\u4ef6\u540d.txt \/\/\u67e5\u770b\u5f53\u524d\u6587\u4ef6\u5177\u4f53\u4fee\u6539\u4e86\u4ec0\u4e48\u5185\u5bb9<\/p>\n<p>git log \/\/\u67e5\u770b\u6bcf\u6b21\u63d0\u4ea4\u6240\u4fee\u6539\u7684\u4ec0\u4e48\u8be6\u7ec6\u5185\u5bb9\uff0c\u65b9\u4fbf\u56de\u5230\u4ece\u524d<br \/>\ngit log &#8211;pretty=oneline \/\/\u7b80\u8981\u7684\u663e\u793a\u6bcf\u6b21\u4fee\u6539\u5185\u5bb9\uff0c\u65b9\u4fbf\u56de\u5230\u4ece\u524d<\/p>\n<p>git reflog \/\/\u67e5\u770b\u6240\u6709\u63d0\u4ea4commit id\uff0c\u65b9\u4fbf\u56de\u5230\u672a\u6765<\/p>\n<p>git branch \/\/\u67e5\u770b\u6240\u6709\u5206\u652f<\/p>\n<p>git stash list \/\/\u67e5\u770bstash\u5217\u8868<\/p>\n<p>git remote -v \/\/\u67e5\u770b\u8fdc\u7a0b\u4ed3\u5e93\u514b\u9686\uff0c\u4e5f\u5c31\u662f\u6211\u4eec\u8981pull\u548cpush\u7684\u8fdc\u7a0b\u4e3b\u673a\u9ed8\u8ba4\u540d\u79f0\u90fd\u662forigin<\/p>\n<p>git remote show &lt;\u4e3b\u673a\u540d&gt;\u00a0 \/\/\u67e5\u770b\u8fdc\u7a0b\u4e3b\u673a\u8be6\u7ec6\u4fe1\u606f<\/p>\n<p>git log &#8211;pretty=oneline &#8211;abbrev-commit \/\/\u67e5\u770b\u5168\u90e8commit id\u548c\u6ce8\u91ca<\/p>\n<p>git tag \/\/\u67e5\u770b\u6240\u6709\u4e3acommit id\u8bbe\u7f6e\u7684\u6807\u7b7e\u540d<\/p>\n<p>git show v0.9 \/\/\u67e5\u770b\u5177\u4f53\u6807\u7b7e\u4fe1\u606f<\/p>\n<p>git check-ignore -v xx.class \/\/\u67e5\u770b.gitignore\u6587\u4ef6\u91cc\u662f\u5426\u542b\u6709xx.class<\/p>\n<p>git branch -a\u00a0 \/\/\u67e5\u770b\u672c\u5730\u548c\u8fdc\u7a0b\u7684\u6240\u6709\u5206\u652f<\/p>\n<p>Git\u7248\u672c\u5e93<br \/>\n\u5c31\u662f\u4ed3\u5e93\u91cc\u9762\u7684\u9690\u85cf\u76ee\u5f55.git<\/p>\n<p>\u5de5\u4f5c\u533a<br \/>\n\u5c31\u662f\u6211\u4eec\u521b\u5efa\u7684\u4ed3\u5e93\uff0c\u9664\u4e86\u9690\u85cf\u76ee\u5f55.git<\/p>\n<p>\u6682\u5b58\u533a<br \/>\n\u6682\u5b58\u533a\u5c31\u5728\u4ed3\u5e93\u91cc\u9762\u9690\u85cf\u7684.git\u76ee\u5f55\u4e2d\uff0c\u8fd8\u6709Git\u4e3a\u6211\u4eec\u81ea\u52a8\u521b\u5efa\u7684\u7b2c\u4e00\u4e2a\u5206\u652fmaster<br \/>\ngit add \u5b9e\u9645\u4e0a\u5c31\u662f\u628a\u6587\u4ef6\u4fee\u6539\u6dfb\u52a0\u5230\u6682\u5b58\u533a<\/p>\n<p>\u5206\u652f<br \/>\n\u6211\u4eec\u521b\u5efa\u4ed3\u5e93\u65f6\u540c\u65f6\u521b\u5efa\u4e86Git\u7248\u672c\u5e93\uff0cGit\u5728\u7248\u672c\u5e93\u91cc\u9762\u81ea\u52a8\u4e3a\u6211\u4eec\u521b\u5efa\u4e86\u552f\u4e00\u4e00\u4e2amaster\u5206\u652f<br \/>\ngit commit \u5b9e\u9645\u4e0a\u5c31\u662f\u628a\u6682\u5b58\u533a\u7684\u6240\u6709\u5185\u5bb9\u63d0\u4ea4\u5230master\u5f53\u524d\u5206\u652f\u3002<\/p>\n<p><span style=\"color: #ff0000;\">\u6dfb\u52a0\u8fdc\u7a0b\u5e93<\/span><br \/>\ngit remote add &lt;\u4e3b\u673a\u540d&gt; &lt;\u7f51\u5740&gt;<\/p>\n<pre>\/\/\u6848\u4f8b\uff0c\u7b2c\u4e00\u6b21\u6dfb\u52a0\u8fdc\u7a0b\u4ed3\u5e93\r\ngit remote add origin git@github.com:chen77134056\/vue-web.git  \/\/\u7b2c\u4e00\u6b21\u521b\u5efa\u4ed3\u5e93\u9700\u8981\u628a\u672c\u5730\u7684origin\u548c\u8fdc\u7a0bgit@github.com:xx\/vue-web.git\u5173\u8054\r\ngit push -u origin master  \/\/\u7b2c\u4e00\u6b21\u628a\u672c\u5730\u7684master\u5206\u652f\u63d0\u4ea4\u5230\u8fdc\u7a0b\u4ed3\u7ba1<\/pre>\n<p>(\u5982\u679c\u8fdc\u7a0b\u5e93\u6709\u66f4\u65b0\uff0c\u6267\u884c\u4ee5\u4e0a\u547d\u4ee4\u4f1a\u51fa\u9519\uff0c\u5fc5\u987b\u5148\u628a\u8fdc\u7a0b\u5e93\u4e0b\u8f7d\u5e76\u5408\u5e76\u5230\u672c\u5730\u540e\u624d\u80fd\u7ee7\u7eedpush\u4ee5\u4e0a\u547d\u4ee4\uff0c<br \/>\n\u5408\u5e76\u4ee3\u7801\uff1agit pull &#8211;rebase &lt;\u8fdc\u7a0b\u4e3b\u673a\u540d&gt; &lt;\u8fdc\u7a0b\u5206\u652f\u540d&gt;:&lt;\u672c\u5730\u5206\u652f\u540d&gt;)<br \/>\ngit push origin master \/\/\u6b64\u540e\uff0c\u6bcf\u6b21\u672c\u5730\u63d0\u4ea4\u540e\uff0c\u53ea\u8981\u6709\u5fc5\u8981\uff0c\u5c31\u53ef\u4ee5\u4f7f\u7528\u547d\u4ee4<br \/>\ngit push origin dev \/\/\u63a8\u9001dev\u5206\u652f<\/p>\n<p><span style=\"color: #ff0000;\">\u4e0b\u8f7d\u8fdc\u7a0b\u5e93<\/span><br \/>\ngit clone git@github.com:michaelliao\/gitskills.git<br \/>\n\u591a\u4eba\u5408\u4f5c\u53ea\u9700\u8981\u4e0b\u8f7d\u672c\u5730\u5e93<\/p>\n<p>\u5206\u652f\u7ba1\u7406<br \/>\n\u5b83\u7684\u5b58\u5728\u662f\u4ec0\u4e48\uff1f<br \/>\n\u5f53\u4f60\u5b8c\u6210\u4e00\u4e2a50%\u7684\u9879\u76ee\u4e0a\u4f20\u8fdc\u7a0b\u5e93\u540e\uff0c\u522b\u4eba\u5728\u4e0b\u8f7d\u57fa\u4e8e\u4f60\u768450%\u9879\u76ee\u4e0d\u80fd\u6b63\u5e38\u8fd0\u884c\u7ed9\u522b\u4eba\u9020\u6210\u9ebb\u70e6\uff0c<br \/>\n\u4f46\u53c8\u6015\u4e0d\u4e0a\u4f20\u4e07\u4e00\u4e22\u5931\u6570\u636e\u3002<br \/>\n\u53ef\u4ee5\u521b\u5efa\u4e00\u4e2a\u5206\u652f\u4fdd\u5b58\u5de5\u4f5c\u7684\u4e2a\u4e2a\u8fdb\u5ea6\u72b6\u51b5\uff0c\u522b\u4eba\u770b\u4e0d\u5230\u4f60\u7684\u5206\u652f\uff0c\u6700\u540e\u518d\u4e00\u6b21\u6027\u5408\u5e76\u5206\u652f\u3002<\/p>\n<p>\u5feb\u6377\u952e\u8bbe\u7f6e<br \/>\ngit config &#8211;global alias.st status<\/p>\n<p>git status<br \/>\n\u7b49\u540c<br \/>\ngit st<\/p>\n<p>\u591a\u4eba\u5408\u4f5c\uff1a<br \/>\n\u9996\u5148\uff0c\u53ef\u4ee5\u8bd5\u56fe\u7528git push origin branch-name\u63a8\u9001\u81ea\u5df1\u7684\u4fee\u6539\uff1b<\/p>\n<p>\u5982\u679c\u63a8\u9001\u5931\u8d25\uff0c\u5219\u56e0\u4e3a\u8fdc\u7a0b\u5206\u652f\u6bd4\u4f60\u7684\u672c\u5730\u66f4\u65b0\uff0c\u9700\u8981\u5148\u7528git pull\u8bd5\u56fe\u5408\u5e76\uff1b<\/p>\n<p>\u5982\u679c\u5408\u5e76\u6709\u51b2\u7a81\uff0c\u5219\u89e3\u51b3\u51b2\u7a81\uff0c\u5e76\u5728\u672c\u5730\u63d0\u4ea4\uff1b<\/p>\n<p>\u6ca1\u6709\u51b2\u7a81\u6216\u8005\u89e3\u51b3\u6389\u51b2\u7a81\u540e\uff0c\u518d\u7528git push origin branch-name\u63a8\u9001\u5c31\u80fd\u6210\u529f\uff01<\/p>\n<p>\u5982\u679cgit pull\u63d0\u793a\u201cno tracking information\u201d\uff0c\u5219\u8bf4\u660e\u672c\u5730\u5206\u652f\u548c\u8fdc\u7a0b\u5206\u652f\u7684\u94fe\u63a5\u5173\u7cfb\u6ca1\u6709\u521b\u5efa\uff0c\u7528\u547d\u4ee4git branch &#8211;set-upstream branch-name origin\/branch-name\u3002<\/p>\n<p>\u8fd9\u5c31\u662f\u591a\u4eba\u534f\u4f5c\u7684\u5de5\u4f5c\u6a21\u5f0f\uff0c\u4e00\u65e6\u719f\u6089\u4e86\uff0c\u5c31\u975e\u5e38\u7b80\u5355\u3002<\/p>\n<p>\u5efa\u8bae\uff1a<br \/>\n1\uff0c\u4e3b\u5206\u652fmaster\u4e00\u822c\u90fd\u662f\u7a33\u5b9a\u9879\u76ee\uff0c\u5373\u80fd\u6b63\u5e38\u5de5\u4f5c\u7684\u3002\u6240\u4ee5\u4e00\u822c\u6211\u4eec\u5f00\u53d1\u5728develop\u5f00\u53d1<br \/>\n2\uff0c\u6bcf\u6b21\u4e3a\u9879\u76ee\u6dfb\u52a0\u4e00\u4e2a\u65b0\u529f\u80fd\uff0c\u5c31\u521b\u5efa\u4e00\u4e2a\u65b0\u5206\u652f\uff0c\u5b8c\u6210\u540e\u5408\u5e76\uff0c\u6700\u540e\uff0c\u5220\u9664\u8be5\u5206\u652f\u3002<br \/>\n3\uff0cmaster\u5206\u652f\u662f\u4e3b\u5206\u652f\uff0c\u56e0\u6b64\u8981\u65f6\u523b\u4e0e\u8fdc\u7a0b\u540c\u6b65\uff1b<br \/>\ndev\u5206\u652f\u662f\u5f00\u53d1\u5206\u652f\uff0c\u56e2\u961f\u6240\u6709\u6210\u5458\u90fd\u9700\u8981\u5728\u4e0a\u9762\u5de5\u4f5c\uff0c\u6240\u4ee5\u4e5f\u9700\u8981\u4e0e\u8fdc\u7a0b\u540c\u6b65\uff1b<br \/>\nbug\u5206\u652f\u53ea\u7528\u4e8e\u5728\u672c\u5730\u4fee\u590dbug\uff0c\u5c31\u6ca1\u5fc5\u8981\u63a8\u5230\u8fdc\u7a0b\u4e86\uff0c\u9664\u975e\u8001\u677f\u8981\u770b\u770b\u4f60\u6bcf\u5468\u5230\u5e95\u4fee\u590d\u4e86\u51e0\u4e2abug\uff1b<br \/>\nfeature\u5206\u652f\u662f\u5426\u63a8\u5230\u8fdc\u7a0b\uff0c\u53d6\u51b3\u4e8e\u4f60\u662f\u5426\u548c\u4f60\u7684\u5c0f\u4f19\u4f34\u5408\u4f5c\u5728\u4e0a\u9762\u5f00\u53d1\u3002<br \/>\n\uff08\u603b\u4e4b\uff0c\u5c31\u662f\u5728Git\u4e2d\uff0c\u5206\u652f\u5b8c\u5168\u53ef\u4ee5\u5728\u672c\u5730\u81ea\u5df1\u85cf\u7740\u73a9\uff0c\u662f\u5426\u63a8\u9001\uff0c\u89c6\u4f60\u7684\u5fc3\u60c5\u800c\u5b9a\uff01\uff09<\/p>\n<p><span style=\"color: #ff0000;\">push\u514d\u8f93\u5165\u5e10\u53f7\u5bc6\u7801(\u53ea\u9002\u7528http\u534f\u8bae\uff0cssh\u8c8c\u4f3c\u4e0d\u884c)<\/span><\/p>\n<p>Linux\u6216\u8005Mac\u4e0b\u65b9\u6cd5\uff1a<\/p>\n<p>1\uff0c\u5728cd ~\u76ee\u5f55\u65b0\u5efa.git-credentials\u540d\u5b57\u7684\u6587\u4ef6\uff0c\u5185\u5bb9\u4e3a\uff1a<\/p>\n<pre>https:\/\/{username}:{password}@github.com<\/pre>\n<p>2\uff0c\u7ec8\u7aef\u8f93\u5165\uff1a<\/p>\n<pre>git config --global credential.helper store<\/pre>\n<p>3\uff0c\u6253\u5f00~\/.gitconfig\u6587\u4ef6\uff0c\u4f1a\u53d1\u73b0\u591a\u4e86\u4e00\u9879:<\/p>\n<pre>[credential]\r\nhelper = store<\/pre>\n<p>Windows\u65b9\u6cd5\uff1a<\/p>\n<p>\u5728%HOME%\u76ee\u5f55\u4e2d\uff0c\u5982\u679c\u4e0d\u77e5\u9053\u5c31\u4f7f\u7528git bash\u53bb\u627ecd ~\u76ee\u5f55\u5373\u53ef\uff0c\u5728~\u76ee\u5f55\u4e0b\u7136\u540e\u7528touch\u521b\u5efa\u6587\u4ef6 .git-credentials<\/p>\n<p><audio style=\"display: none;\" controls=\"controls\"><\/audio><\/p>\n<p><audio style=\"display: none;\" controls=\"controls\"><\/audio><\/p>\n<p><audio style=\"display: none;\" controls=\"controls\"><\/audio><\/p>\n<p><audio style=\"display: none;\" controls=\"controls\"><\/audio><\/p>\n<p><audio style=\"display: none;\" controls=\"controls\"><\/audio><\/p>\n<p><audio style=\"display: none;\" controls=\"controls\"><\/audio><\/p>\n<p><audio style=\"display: none;\" controls=\"controls\"><\/audio><\/p>\n<p><audio style=\"display: none;\" controls=\"controls\"><\/audio><\/p>\n","protected":false},"excerpt":{"rendered":"<p>git \u4ee5\u4e0b\u662f\u672c\u4eba\u5e38\u7528\u7684git\u547d\u4ee4\uff0cgit\u6709\u4e00\u4e2a\u4e0d\u660e\u6587\u7684\u89c4\u5b9a\u8981\u4e3a\u7b2c\u4e00\u6b21\u4f7f\u7528git\u7684\u4eba\u4ecb\u7ecd\u4e00\u4e0b\uff0c master\uff1a [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"closed","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[11],"tags":[],"class_list":["post-6269","post","type-post","status-publish","format-standard","hentry","category-11"],"_links":{"self":[{"href":"https:\/\/sdeno.com\/index.php?rest_route=\/wp\/v2\/posts\/6269","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/sdeno.com\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/sdeno.com\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/sdeno.com\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/sdeno.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=6269"}],"version-history":[{"count":8,"href":"https:\/\/sdeno.com\/index.php?rest_route=\/wp\/v2\/posts\/6269\/revisions"}],"predecessor-version":[{"id":10032,"href":"https:\/\/sdeno.com\/index.php?rest_route=\/wp\/v2\/posts\/6269\/revisions\/10032"}],"wp:attachment":[{"href":"https:\/\/sdeno.com\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=6269"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/sdeno.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=6269"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/sdeno.com\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=6269"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}