{"id":37542,"date":"2022-11-20T02:32:00","date_gmt":"2023-02-03T02:44:34","guid":{"rendered":"https:\/\/www.silicloud.com\/zh\/blog\/%e6%80%bb%e7%bb%93%e4%ba%86%e6%9c%89%e5%85%b3git%e7%9a%84%e4%bf%a1%e6%81%af%e3%80%82\/"},"modified":"2024-04-29T01:32:30","modified_gmt":"2024-04-28T17:32:30","slug":"%e6%80%bb%e7%bb%93%e4%ba%86%e6%9c%89%e5%85%b3git%e7%9a%84%e4%bf%a1%e6%81%af%e3%80%82","status":"publish","type":"post","link":"https:\/\/www.silicloud.com\/zh\/blog\/%e6%80%bb%e7%bb%93%e4%ba%86%e6%9c%89%e5%85%b3git%e7%9a%84%e4%bf%a1%e6%81%af%e3%80%82\/","title":{"rendered":"\u603b\u7ed3\u4e86\u6709\u5173Git\u7684\u4fe1\u606f"},"content":{"rendered":"<h1>Git\u7684\u4f5c\u7528\u662f\u4ec0\u4e48\uff1f<\/h1>\n<p>Git\u662f\u7528\u4e8e\u7ba1\u7406\u6587\u4ef6\u7248\u672c\u7684\u5de5\u5177\u3002\u5b83\u53ef\u4ee5\u5c06\u6587\u4ef6\u4fe1\u606f\u4fdd\u5b58\u4e3a\u5feb\u7167\u3002<br \/>\n\u5b83\u88ab\u7528\u6765\u4e86\u89e3\u6700\u65b0\u7684\u6587\u4ef6\u3001\u9632\u6b62\u8bef\u8986\u76d6\u7b49\u76ee\u7684\u3002<br \/>\n\u6b64\u5916\uff0c\u901a\u8fc7\u8ffd\u8e2a\u63d0\u4ea4\uff0c\u53ef\u4ee5\u5c06\u6587\u4ef6\u6062\u590d\u5230\u4e4b\u524d\u7684\u72b6\u6001\u3002\u8fd9\u662f\u56e0\u4e3aGit\u5c06\u6587\u4ef6\u4fdd\u5b58\u4e3a\u5feb\u7167\u6240\u4ee5\u624d\u80fd\u5b9e\u73b0\u8fd9\u4e00\u529f\u80fd\u3002<\/p>\n<h1>\u8ba9\u6211\u4eec\u5728Git\u4e2d\u8f93\u5165\u7528\u6237\u7684\u4fe1\u606f\uff08\u8fdb\u884c\u521d\u59cb\u5316\u8bbe\u7f6e\uff09\u3002<\/h1>\n<pre class=\"post-pre\"><code>#\u307e\u305a\u306f\u4e0b\u306e\u4e8c\u3064\u3092\u767b\u9332\u3059\u308b\r\ngit config --global user.name \"github\u306e\u540d\u524d\"\r\ngit config --global user.email github\u306b\u767b\u9332\u3057\u305femail\r\n\r\ngit config user.name\u306a\u3069\u3067\u78ba\u8a8d\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u308b\u3002\u30ed\u30fc\u30ab\u30eb\u74b0\u5883\u306e\u5834\u5408\u306f\u30a8\u30c7\u30a3\u30bf\u30fc\u3082\u767b\u9332\u3059\u308b\u3089\u3057\u3044\u3002\r\n<\/code><\/pre>\n<p>\u987a\u4fbf\u8bf4\u4e00\u53e5\uff0c\u5c06GitHub\u89c6\u4e3a\u4f4d\u4e8e\u5728\u7ebf\u4e0a\u7684git\u4ee3\u7801\u5b58\u50a8\u5e93\u4f1a\u66f4\u5bb9\u6613\u7406\u89e3\u3002\u8fd9\u88ab\u79f0\u4e3a\u8fdc\u7a0b\u4ee3\u7801\u5e93\u3002<\/p>\n<h1>Git\u5e38\u7528\u547d\u4ee4<\/h1>\n<h3>\u8fdb\u5165\u6587\u4ef6\u5939\u7684\u547d\u4ee4<\/h3>\n<p>\u5207\u6362\u76ee\u5f55\u3002\u7ffb\u8bd1\u4e3a&#8221;change directory&#8221;\u7684\u7f29\u5199\u3002<\/p>\n<h3>\u5217\u51fa\u6587\u4ef6\u548c\u76ee\u5f55\u4fe1\u606f<\/h3>\n<p>\u4f7f\u7528\u201cls -a\u201d\u547d\u4ee4\u53ef\u4ee5\u67e5\u770b\u76ee\u5f55\u7684\u5185\u5bb9\uff0c\u5305\u62ec\u9690\u85cf\u6587\u4ef6\u7684\u5168\u90e8\u5185\u5bb9\u3002<\/p>\n<h3>\u521b\u5efa\u76ee\u5f55\u547d\u4ee4<\/h3>\n<p>\u521b\u5efa\u4e00\u4e2a\u65b0\u76ee\u5f55\u3002<\/p>\n<h3>\u5220\u9664\u547d\u4ee4<\/h3>\n<p>\u6211\u8981\u5220\u9664\u8fd9\u4e2a\u6587\u4ef6\u3002<\/p>\n<h3>\u590d\u5236\u547d\u4ee4cp<\/h3>\n<p>\u590d\u5236\u6587\u4ef6\u3002<\/p>\n<h3>\u79fb\u52a8\u547d\u4ee4<\/h3>\n<p>\u8fdb\u884c\u6587\u4ef6\u7684\u79fb\u52a8\u548c\u6587\u4ef6\u540d\u7684\u66f4\u6539\u3002<\/p>\n<h3>\u732b\u6307\u4ee4<\/h3>\n<p>\u663e\u793a\u6587\u4ef6\u5185\u5bb9\u3002<\/p>\n<h1>\u5730\u65b9\u5206\u6210\u4e09\u4e2a\u90e8\u5206\u3002<\/h1>\n<p>git\u7684\u672c\u5730\u73af\u5883\u4e3b\u8981\u5206\u4e3a\u5de5\u4f5c\u76ee\u5f55\u3001\u6682\u5b58\u533a\u548c\u4ed3\u5e93\u8fd9\u4e09\u90e8\u5206\u3002<br \/>\n\u4e3a\u4ec0\u4e48\u9700\u8981\u6682\u5b58\u533a\u5462\uff1f\u8fd9\u662f\u56e0\u4e3a\u6709\u4e9b\u4fee\u6539\u540e\u7684\u6587\u4ef6\u9700\u8981\u4fdd\u5b58\u5230\u4ed3\u5e93\u4e2d\uff0c\u800c\u6709\u4e9b\u4fee\u6539\u5219\u4e0d\u5e0c\u671b\u4fdd\u5b58\uff0c\u4f7f\u7528\u6682\u5b58\u533a\u53ef\u4ee5\u6ee1\u8db3\u8fd9\u79cd\u9700\u6c42\u3002\u53ea\u9700\u5c06\u60f3\u8981\u4fee\u6539\u7684\u6587\u4ef6\u6dfb\u52a0\u5230\u6682\u5b58\u533a\uff0c\u7136\u540e\u63d0\u4ea4\uff08\u4fdd\u5b58\u5feb\u7167\uff09\uff0c\u8fd9\u6837\u5c31\u53ef\u4ee5\u5b9e\u73b0\u53ea\u4fdd\u5b58\u60f3\u8981\u4fee\u6539\u7684\u6587\u4ef6\u7684\u5dee\u5f02\u3002<\/p>\n<h1>\u521b\u5efa\u65b0\u7684\u672c\u5730\u4ed3\u5e93<\/h1>\n<pre class=\"post-pre\"><code>$git init \r\n<\/code><\/pre>\n<p>\u6267\u884c\u6b64\u64cd\u4f5c\u4f1a\u521b\u5efa\u4e00\u4e2a.git\u6587\u4ef6\u5939\uff0c\u8fd9\u5b9e\u9645\u4e0a\u662f\u6307\u672c\u5730\u4ed3\u5e93\u3002<br \/>\n.git\u6587\u4ef6\u5939\u662f\u4e00\u4e2a\u9690\u85cf\u6587\u4ef6\u5939\uff0c\u5728\u5de5\u4f5c\u76ee\u5f55\u4e2d\u65e0\u6cd5\u770b\u5230\u3002<\/p>\n<h1>\u786e\u8ba4\u5dee\u5f02\u53d8\u66f4\u7684\u65b9\u5f0f<\/h1>\n<pre class=\"post-pre\"><code>$git diff\r\n$git diff \u30d5\u30a1\u30a4\u30eb\u540d\r\n$git diff --staged\r\n<\/code><\/pre>\n<p>\u901a\u8fc7\u8fd9\u4e2a\u547d\u4ee4\uff0c\u5728\u7ec8\u7aef\u4e2d\u5c06\u663e\u793a\u6587\u4ef6\u7684\u66f4\u6539\u5dee\u5f02\u3002<br \/>\n\u901a\u8fc7&#8211;staged\u53c2\u6570\uff0c\u53ef\u4ee5\u5728\u7ec8\u7aef\u4e2d\u663e\u793a\u6682\u5b58\u533a\u548c\u672c\u5730\u4ed3\u5e93\u4e4b\u95f4\u7684\u5dee\u5f02\u3002<\/p>\n<h1>\u5728Git\u4e2d\u53d6\u6d88\u6682\u5b58<\/h1>\n<pre class=\"post-pre\"><code>$git reset\r\n$git reset \u30d5\u30a1\u30a4\u30eb\u540d\r\n\r\n#\u4ee5\u4e0b\u3067\u3082ok\r\n$git reset HEAD .\r\n$git reset HEAD \u30d5\u30a1\u30a4\u30eb\u540d\r\n<\/code><\/pre>\n<p>\u8fd9\u4e9b\u547d\u4ee4\u4ece\u4ed3\u5e93\u83b7\u53d6\u6700\u65b0\u7684\u63d0\u4ea4\uff0c\u5e76\u5c06\u5dee\u5f02\u4fee\u590d\u5230\u63d0\u4ea4\u548c\u6682\u5b58\u533a\u4e2d\u3002\u6362\u53e5\u8bdd\u8bf4\uff0c\u6682\u5b58\u533a\u7684\u4fee\u6539\u88ab\u64a4\u9500\uff0c\u4f46\u5de5\u4f5c\u533a\u7684\u4fee\u6539\u6ca1\u6709\u88ab\u64a4\u9500\u3002<\/p>\n<h1>\u67e5\u770b\u4fee\u6539\u5386\u53f2<\/h1>\n<pre class=\"post-pre\"><code>$git log\r\n\r\n#1\u884c\u3067\u8868\u793a\u3059\u308b\r\n$git log --oneline\r\n\r\n#\u30d5\u30a1\u30a4\u30eb\u306e\u5909\u66f4\u5dee\u5206\u3092\u8868\u793a\u3059\u308b\r\n$git log -p index.html\r\n\r\n#\u8868\u793a\u3059\u308b\u30b3\u30df\u30c3\u30c8\u6570\u3092\u5236\u9650\u3059\u308b\r\n$git log -n &lt;\u30b3\u30df\u30c3\u30c8\u6570&gt;\r\n<\/code><\/pre>\n<h1>\u8bb0\u5f55\u6587\u4ef6\u5220\u9664\u64cd\u4f5c<\/h1>\n<pre class=\"post-pre\"><code>#\u30ea\u30dd\u30b8\u30c8\u30ea\u3068\u30ef\u30fc\u30af\u30c4\u30ea\u30fc\u3069\u3061\u3089\u3082\u524a\u9664\u3055\u308c\u308b\r\n$git rm \u30d5\u30a1\u30a4\u30eb\u540d\r\n$git rm -r \u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u540d\r\n\r\n#\u30ea\u30dd\u30b8\u30c8\u30ea\u304b\u3089\u3060\u3051\u524a\u9664\u3057\u3001\u30ef\u30fc\u30af\u30c4\u30ea\u30fc\u3067\u306f\u30d5\u30a1\u30a4\u30eb\u3092\u6b8b\u3057\u305f\u3044\u6642\r\n$git rm --cached \u30d5\u30a1\u30a4\u30eb\u540d\r\n<\/code><\/pre>\n<p>\u5728\u63d0\u4ea4\u5305\u542b\u5bc6\u7801\u7684\u6587\u4ef6\u65f6\uff0c\u6700\u540e\u4e00\u4e2a\u547d\u4ee4\u7528\u6765\u4fee\u6b63\u9519\u8bef\u3002<\/p>\n<h1>\u8bb0\u5f55\u6587\u4ef6\u7684\u79fb\u52a8<\/h1>\n<pre class=\"post-pre\"><code>$git mv \u65e7\u30d5\u30a1\u30a4\u30eb\u3000\u65b0\u30d5\u30a1\u30a4\u30eb\r\n\r\n#\u4ee5\u4e0b\u306e\u30b3\u30de\u30f3\u30c9\u3068\u540c\u3058\r\nmv \u65e7\u30d5\u30a1\u30a4\u30eb\u3000\u65b0\u30d5\u30a1\u30a4\u30eb\r\ngit rm \u65e7\u30d5\u30a1\u30a4\u30eb\r\ngit add \u65b0\u30d5\u30a1\u30a4\u30eb\r\n<\/code><\/pre>\n<p>\u6267\u884c\u6b64\u547d\u4ee4\u540e\uff0c\u53ef\u4ee5\u66f4\u6539\u6587\u4ef6\u540d\u79f0\u5e76\u5c06\u66f4\u6539\u7684\u5dee\u5f02\u4e0a\u4f20\u5230\u9636\u6bb5\u3002<\/p>\n<h1>\u6dfb\u52a0\u65b0\u7684\u8fdc\u7a0b\u4ee3\u7801\u5e93<\/h1>\n<pre class=\"post-pre\"><code>$git remote add origin  https:\/\/~~ \r\n<\/code><\/pre>\n<h1>\u5c06\u5176\u53d1\u9001\u5230\u8fdc\u7a0b\u5b58\u50a8\u5e93<\/h1>\n<pre class=\"post-pre\"><code>$git push \u30ea\u30e2\u30fc\u30c8\u540d\u3000\u30d6\u30e9\u30f3\u30c1\u540d\r\n\r\n#\u5177\u4f53\u7684\u306b\u306f\u4ee5\u4e0b\u306e\u3088\u3046\u306a\u611f\u3058\u306b\u3002\r\n$git push origin master\r\n$git push -u origin master\r\n$git push origin develop\r\n<\/code><\/pre>\n<p>\u5982\u679c\u52a0\u4e0a-u\u9009\u9879\uff0c\u4ee5\u540e\u53ea\u9700\u4f7f\u7528git push\u547d\u4ee4\u5c31\u53ef\u4ee5\u5c06\u672c\u5730\u4ed3\u5e93\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\u3002<\/p>\n<p>\u987a\u4fbf\u63d0\u4e00\u4e0b\uff0c\u5728\u9700\u8981\u786e\u8ba4\u8fdc\u7a0b\u5b58\u50a8\u5e93\u7684URL\u65f6<\/p>\n<pre class=\"post-pre\"><code>git remote -v\r\n<\/code><\/pre>\n<p>\u901a\u8fc7\u5c1d\u8bd5\u53ef\u4ee5\u786e\u8ba4\u3002<\/p>\n<h1>\u7ed9\u5b83\u53d6\u4e00\u4e2a\u522b\u540d<\/h1>\n<pre class=\"post-pre\"><code>$git config --global alias.ci commit\r\n$git config --global alias.st status\r\n<\/code><\/pre>\n<p>\u501f\u52a9\u6b64\uff0c\u60a8\u53ef\u4ee5\u8f93\u5165\u7b80\u5316\u7684 git st \u547d\u4ee4\u3002<\/p>\n<h1>\u5c06\u6587\u4ef6\u4ecegit\u7ba1\u7406\u4e2d\u89e3\u7ed1\u3002<\/h1>\n<p>\u53ef\u4ee5\u901a\u8fc7\u5728.gitignore\u6587\u4ef6\u4e2d\u6dfb\u52a0\u5185\u5bb9\u6765\u5c06\u5176\u4ece\u7248\u672c\u63a7\u5236\u4e2d\u6392\u9664\u3002<\/p>\n<h1>\u64a4\u9500\u5bf9\u6587\u4ef6\u7684\u66f4\u6539\u3002<\/h1>\n<pre class=\"post-pre\"><code>$git checkout --\u30d5\u30a1\u30a4\u30eb\u540d\r\n$git checkout --\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u540d\r\n\r\n#\u5168\u5909\u66f4\u3092\u53d6\u308a\u6d88\u3059\r\n$git checkout -- .\r\n<\/code><\/pre>\n<p>\u8fd9\u4e9b\u529f\u80fd\u53ef\u4ee5\u5c06\u5de5\u4f5c\u533a\u7684\u72b6\u6001\u4e0e\u6682\u5b58\u533a\u7684\u72b6\u6001\u540c\u6b65\u3002<\/p>\n<h1>\u91cd\u65b0\u6267\u884c\u6700\u8fd1\u7684\u63d0\u4ea4<\/h1>\n<pre class=\"post-pre\"><code>$git commit --amend\r\n<\/code><\/pre>\n<p>\u5f53\u4f60\u4f7f\u7528git commit\u547d\u4ee4\u5e76\u5fd8\u8bb0\u4fee\u6539\u67d0\u4e2a\u6587\u4ef6\u65f6\uff0c\u53ef\u4ee5\u901a\u8fc7\u4fee\u6539\u8be5\u6587\u4ef6\u3001git add\u5e76\u6267\u884cgit commit &#8211;amend\u547d\u4ee4\u6765\u91cd\u65b0\u63d0\u4ea4\u5305\u542b\u6587\u4ef6\u4fee\u6539\u7684\u66f4\u65b0\u3002<\/p>\n<p>\u8bf7\u6ce8\u610f\uff0c\u4e0d\u8981\u91cd\u590d\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\u7684\u63d0\u4ea4\u8bb0\u5f55\uff01\uff01\uff01<\/p>\n<h1>\u6dfb\u52a0\u65b0\u7684\u8fdc\u7a0b\u5b58\u50a8\u5e93<\/h1>\n<pre class=\"post-pre\"><code>$git remote add \u30ea\u30e2\u30fc\u30c8\u540d \u30ea\u30e2\u30fc\u30c8URL\r\n<\/code><\/pre>\n<h1>\u4ece\u8fdc\u7a0b\u83b7\u53d6\uff0c\u8fdb\u884c\u6293\u53d6\u3002<\/h1>\n<pre class=\"post-pre\"><code>$git fetch \u30ea\u30e2\u30fc\u30c8\u540d\r\n$git fetch origin\r\n<\/code><\/pre>\n<p>\u8fd9\u4e2a\u547d\u4ee4\u7684\u4f5c\u7528\u662f\u5c06\u8fdc\u7a0b\u4ed3\u5e93\u7684\u5185\u5bb9\u540c\u6b65\u5230\u672c\u5730\u4ed3\u5e93\u4e2d\u3002\u7136\u800c\uff0c\u5b83\u5e76\u4e0d\u4f1a\u53cd\u6620\u5230\u5de5\u4f5c\u533a\u4e2d\uff0c\u6240\u4ee5\u9700\u8981\u8fdb\u884cgit merge\u64cd\u4f5c\u3002<\/p>\n<p>\u518d\u6b21\uff0c\u5f53\u4f60\u83b7\u53d6\u5230\u540e<\/p>\n<pre class=\"post-pre\"><code>$ git branch -a\r\n$ git checkout remotes\/origin\/master\r\n<\/code><\/pre>\n<p>\u8fd8\u6709\u4e00\u79cd\u65b9\u6cd5\u53ef\u4ee5\u5c06\u6b64\u6b65\u9aa4\u5e94\u7528\u5230\u5de5\u4f5c\u533a\u3002<\/p>\n<pre class=\"post-pre\"><code>$git merge origin\/master\r\n<\/code><\/pre>\n<p>\u4f7f\u7528\u6b64\u547d\u4ee4\u53ef\u4ee5\u5c06\u540d\u4e3aorigin\u7684\u8fdc\u7a0b\u4ed3\u5e93\u7684\u4e3b\u5206\u652f\u53cd\u6620\u5230\u81ea\u5df1\u7684\u5de5\u4f5c\u6811\u4e2d\u3002<\/p>\n<h1>\u8fdc\u7a0b\u83b7\u53d6\u3002\u62c9\u53d6\u7bc7\u3002<\/h1>\n<p>\u5f53\u9700\u8981\u8fdc\u7a0b\u83b7\u53d6\u4fe1\u606f\u5e76\u4e00\u6c14\u5b8c\u6210\u5408\u5e76\u64cd\u4f5c\u65f6\uff0c\u53ef\u4ee5\u4f7f\u7528pull\u3002<\/p>\n<pre class=\"post-pre\"><code>$git pull \u30ea\u30e2\u30fc\u30c8\u540d\u3000\u30d6\u30e9\u30f3\u30c1\u540d\r\n$git pull origin master\r\n<\/code><\/pre>\n<p>\u4ee5\u4e0a\u63d0\u5230\u7684\u5206\u652f\u540d\u662f\u6307\u8fdc\u7a0b\u5b58\u50a8\u5e93\u7684\u5206\u652f\u540d\u3002<br \/>\n\u66f4\u8be6\u7ec6\u5730\u8bf4\uff0c\u662f\u5c06\u8fdc\u7a0b\u540d\u79f0\u4e2d\u7684\u5206\u652f\u5408\u5e76\u5230\u5f53\u524d\u6240\u5728\u7684\u5206\u652f\u4e0a\u7684\u610f\u601d\u5417\uff1f<\/p>\n<h1>\u786e\u8ba4\u8fdc\u7a0b\u7684\u8be6\u7ec6\u4fe1\u606f\u3002<\/h1>\n<pre class=\"post-pre\"><code>$git remote show \u30ea\u30e2\u30fc\u30c8\u540d\r\n$git remote show origin\r\n<\/code><\/pre>\n<p>\u4f7f\u7528\u8fd9\u4e2a\u547d\u4ee4\u53ef\u4ee5\u83b7\u53d6\u6bd4git remote\u66f4\u8be6\u7ec6\u7684\u4fe1\u606f\u3002<\/p>\n<h1>\u4fee\u6539\u8fdc\u7a0b\u540d\u79f0<\/h1>\n<pre class=\"post-pre\"><code>$git remote rename \u65e7name \u65b0name\r\n\r\n#remote\u3092\u524a\u9664\u3057\u305f\u3044\r\n$git remote rm \u30ea\u30e2\u30fc\u30c8\u540d\r\n<\/code><\/pre>\n<h1>\u65b0\u5efa\u4e00\u4e2a\u5206\u652f<\/h1>\n<pre class=\"post-pre\"><code>$git branch  \u30d6\u30e9\u30f3\u30c1\u540d\r\n<\/code><\/pre>\n<p>\u6ce8\u610f\u4e8b\u9879\u662f\u521b\u5efa\u5206\u652f\uff0c\u4f46\u4e0d\u8fdb\u884c\u5207\u6362\u3002<\/p>\n<h1>\u5207\u6362\u5206\u652f<\/h1>\n<pre class=\"post-pre\"><code>$git checkout \u65e2\u5b58\u30d6\u30e9\u30f3\u30c1\u540d\r\n$git checkout -b \u65b0\u30d6\u30e9\u30f3\u30c1\u540d\r\n<\/code><\/pre>\n<p>\u901a\u8fc7\u5207\u6362\u5206\u652f\u8fdb\u884c\u5f00\u53d1\uff0c\u53ef\u4ee5\u5b9e\u73b0\u72ec\u7acb\u7684\u5f00\u53d1\u8fdb\u7a0b\u3002<\/p>\n<h1>\u5408\u5e76\u7684\u65b9\u6cd5<\/h1>\n<p>\u987a\u4fbf\u8bf4\u4e00\u4e0b\uff0c\u5408\u5e76\u662f\u6307\u5c06\u5176\u4ed6\u4eba\u7684\u4fee\u6539\u5185\u5bb9\u5408\u5e76\u8fdb\u6765\u3002<\/p>\n<pre class=\"post-pre\"><code>$git merge \u30d6\u30e9\u30f3\u30c1\u540d\r\n$git merge \u30ea\u30e2\u30fc\u30c8\u540d\/\u30d6\u30e9\u30f3\u30c1\u540d\r\n<\/code><\/pre>\n<h1>\u66f4\u6539\u5206\u652f\u540d\u79f0<\/h1>\n<pre class=\"post-pre\"><code>#\u5909\u3048\u305f\u3044\u30d6\u30e9\u30f3\u30c1\u306b\u79fb\u52d5\u3057\u3066\u304b\u3089\u306e\r\n$git branch -m \u30d6\u30e9\u30f3\u30c1\u540d\r\n<\/code><\/pre>\n<h1>\u5220\u9664\u5206\u652f<\/h1>\n<pre class=\"post-pre\"><code>$git branch -d \u30d6\u30e9\u30f3\u30c1\u540d\r\n\r\n#\u5f37\u5236\u524a\u9664\u3059\u308b\r\n$git branch -D \u30d6\u30e9\u30f3\u30c1\u540d\r\n<\/code><\/pre>\n<h1>&#8220;\u30ea\u30d9\u30fc\u30b9&#8221; \u662f\u4ec0\u4e48\u610f\u601d\uff1f<\/h1>\n<p>\u5728\u6574\u5408\u53d8\u66f4\u65f6\uff0c\u6211\u4eec\u4f7f\u7528rebase\u6765\u6574\u7406\u5386\u53f2\u8bb0\u5f55\u3002<\/p>\n<pre class=\"post-pre\"><code>$git rebase \u7e4b\u3050\u5143\u306b\u3059\u308b\u30d6\u30e9\u30f3\u30c1\u540d\r\n<\/code><\/pre>\n<p>\u7136\u800c\uff0c\u5982\u679c\u5c06git push\u7684\u5206\u652f\u6807\u8bb0\u4e3afeature\uff0c\u5e76\u5728feature\u5206\u652f\u4e0a\u6267\u884cgit rebase master\uff0c\u5219\u4f1a\u5bfc\u81f4\u8fdc\u7a0b\u5b58\u50a8\u5e93\u4e2d\u7684\u8bb0\u5f55\u4e0e\u672c\u5730\u8bb0\u5f55\u76f8\u77db\u76fe\uff0c\u56e0\u6b64\u5e94\u907f\u514d\u5bf9\u5df2git push\u7684\u5206\u652f\u4f7f\u7528rebase\u3002<\/p>\n<h1>\u62c9\u53d6\u7684rebase\u7c7b\u578b<\/h1>\n<p>\u53ea\u9700\u83b7\u53d6\u8fdc\u7a0b\u4ed3\u5e93\u7684\u6700\u65b0\u4fe1\u606f\uff0c\u4e0d\u9700\u8981\u63d0\u4ea4commit\u65f6\uff0c\u6211\u4eec\u53ef\u4ee5\u4f7f\u7528\u5e38\u89c4\u7684git pull origin master\u547d\u4ee4\uff0c\u5b83\u4f1a\u7559\u4e0b\u5408\u5e76commit\u3002<\/p>\n<pre class=\"post-pre\"><code>$git pull --rebase \u30ea\u30e2\u30fc\u30c8\u540d\u3000\u30d6\u30e9\u30f3\u30c1\u540d\r\n$git pull --rebase origin master\r\n<\/code><\/pre>\n<p>\u4f7f\u7528\u8be5\u65b9\u6cd5\u540e\uff0c\u4e0d\u518d\u6709\u63d0\u4ea4\u8bb0\u5f55\u3002<\/p>\n<h2>\u5c06pull\u8bbe\u7f6e\u4e3arebase\u7c7b\u578b<\/h2>\n<pre class=\"post-pre\"><code>$git config --global pull.rebase true\r\n\r\n#master\u30d6\u30e9\u30f3\u30c1\u3060\u3051\u8a2d\u5b9a\u3057\u305f\u3044\u6642\r\n$git config branch.master.rebase true\r\n<\/code><\/pre>\n<h1>\u6807\u8bb0\u4e0a<\/h1>\n<h2>\u8981\u60f3\u663e\u793a\u6807\u7b7e\u5217\u8868\u3002<\/h2>\n<pre class=\"post-pre\"><code>$git tag\r\n\r\n#\u30d1\u30bf\u30fc\u30f3\u3092\u6307\u5b9a\u3057\u3066\u30bf\u30b0\u3092\u8868\u793a\r\n$git tag -l \"202001\"\r\n<\/code><\/pre>\n<h2>\u521b\u5efa\u5e26\u6709\u6ce8\u91ca\u7684\u6807\u7b7e<\/h2>\n<pre class=\"post-pre\"><code>$git tag -a \u30bf\u30b0\u540d -m \"\u30e1\u30c3\u30bb\u30fc\u30b8\"\r\n$git tag -a 202001 -m \"version 202001\"\r\n<\/code><\/pre>\n<h2>\u5275\u5efa\u8f15\u91cf\u7248\u7684\u6a19\u7c64<\/h2>\n<pre class=\"post-pre\"><code>$git tag \u30bf\u30b0\u540d\r\n\r\n#\u5f8c\u304b\u3089\u30bf\u30b0\u4ed8\u3051\u3059\u308b\r\n$git tag \u30bf\u30b0\u540d\u3000\u30b3\u30df\u30c3\u30c8\u540d\r\n<\/code><\/pre>\n<h1>\u5c06\u6807\u7b7e\u53d1\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93<\/h1>\n<pre class=\"post-pre\"><code>$git push \u30ea\u30e2\u30fc\u30c8\u540d\u3000\u30bf\u30b0\u540d\r\n$git push origin 202001\r\n\r\n#\u30bf\u30b0\u3092\u5168\u3066\u9001\u4fe1\u3059\u308b\r\n$git push origin --tags\r\n<\/code><\/pre>\n<h1>\u5728\u201cStash\u201d\uff08\u8f6f\u4ef6\uff09\u4e0a\u4e34\u65f6\u907f\u514d\u5de5\u4f5c<\/h1>\n<pre class=\"post-pre\"><code>$git stash\r\n$git stash save\r\n#\u3069\u3061\u3089\u3082\u540c\u3058\r\n<\/code><\/pre>\n<p>\u901a\u8fc7\u4f7f\u7528stash\u6765\u4e34\u65f6\u4fdd\u5b58\u672a\u63d0\u4ea4\u7684\u66f4\u6539\uff0c\u53ef\u4ee5\u5728\u5176\u4ed6\u5206\u652f\u4e0a\u8fdb\u884c\u64cd\u4f5c\uff0c\u800c\u65e0\u9700\u8fdb\u884c\u63d0\u4ea4\u3002<\/p>\n<h1>\u786e\u8ba4\u907f\u96be\u540e\u7684\u5de5\u4f5c<\/h1>\n<pre class=\"post-pre\"><code>$git stash list\r\n<\/code><\/pre>\n<h1>\u6062\u590d\u88ab\u758f\u6563\u7684\u5de5\u4f5c<\/h1>\n<pre class=\"post-pre\"><code>$git stash apply\r\n\r\n#\u30b9\u30c6\u30fc\u30b8\u306e\u72b6\u6cc1\u3082\u5fa9\u5143\u3059\u308b\r\n$git stash apply --index\r\n\r\n#\u7279\u5b9a\u306e\u4f5c\u696d\u3092\u5fa9\u5143\u3059\u308b\r\n$git stash apply \u30b9\u30bf\u30c3\u30b7\u30e5\u540d\r\n$git stash apply stash@{1}\r\n<\/code><\/pre>\n<h1>\u5220\u9664\u5df2\u7ecf\u907f\u96be\u7684\u5de5\u4f5c<\/h1>\n<pre class=\"post-pre\"><code>#\u6700\u65b0\u306e\u4f5c\u696d\u3092\u524a\u9664\u3059\u308b\r\n$git stash drop\r\n\r\n#\u7279\u5b9a\u306e\u4f5c\u696d\u3092\u524a\u9664\u3059\u308b\r\n$git stash drop \u30b9\u30bf\u30c3\u30b7\u30e5\u540d\r\n\r\n#\u5168\u4f5c\u696d\u3092\u524a\u9664\u3059\u308b\r\n$git stash clear\r\n<\/code><\/pre>\n<h1>\u6211\u60f3\u56de\u5230\u7279\u5b9a\u7684Git\u63d0\u4ea4\uff01<\/h1>\n<pre class=\"post-pre\"><code>$ git log \/\/\u623b\u3059\u5bfe\u8c61\u306e\u30cf\u30c3\u30b7\u30e5\u5024\u3092\u8abf\u3079\u308b\r\ncommit ************************\r\n\r\n$ git reset --hard \u30cf\u30c3\u30b7\u30e5\u5024\r\n<\/code><\/pre>\n<p>\u8fd9\u6837\u505a\u4f1a\u4f7f\u5220\u9664\u7684\u6587\u4ef6\u548c\u5176\u4ed6\u4e00\u4e9b\u4e1c\u897f\u6062\u590d\u539f\u72b6\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"<p>Git\u7684\u4f5c\u7528\u662f\u4ec0\u4e48\uff1f Git\u662f\u7528\u4e8e\u7ba1\u7406\u6587\u4ef6\u7248\u672c\u7684\u5de5\u5177\u3002\u5b83\u53ef\u4ee5\u5c06\u6587\u4ef6\u4fe1\u606f\u4fdd\u5b58\u4e3a\u5feb\u7167\u3002 \u5b83\u88ab\u7528\u6765\u4e86\u89e3\u6700\u65b0\u7684\u6587\u4ef6\u3001\u9632 [&hellip;]<\/p>\n","protected":false},"author":6,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-37542","post","type-post","status-publish","format-standard","hentry","category-uncategorized"],"yoast_head":"<!-- This site is optimized with the Yoast SEO Premium plugin v21.5 (Yoast SEO v21.5) - https:\/\/yoast.com\/wordpress\/plugins\/seo\/ -->\n<title>\u603b\u7ed3\u4e86\u6709\u5173Git\u7684\u4fe1\u606f - Blog - Silicon Cloud<\/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.silicloud.com\/zh\/blog\/\u603b\u7ed3\u4e86\u6709\u5173git\u7684\u4fe1\u606f\u3002\/\" \/>\n<meta property=\"og:locale\" content=\"zh_CN\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"\u603b\u7ed3\u4e86\u6709\u5173Git\u7684\u4fe1\u606f\" \/>\n<meta property=\"og:description\" content=\"Git\u7684\u4f5c\u7528\u662f\u4ec0\u4e48\uff1f Git\u662f\u7528\u4e8e\u7ba1\u7406\u6587\u4ef6\u7248\u672c\u7684\u5de5\u5177\u3002\u5b83\u53ef\u4ee5\u5c06\u6587\u4ef6\u4fe1\u606f\u4fdd\u5b58\u4e3a\u5feb\u7167\u3002 \u5b83\u88ab\u7528\u6765\u4e86\u89e3\u6700\u65b0\u7684\u6587\u4ef6\u3001\u9632 [&hellip;]\" \/>\n<meta property=\"og:url\" content=\"https:\/\/www.silicloud.com\/zh\/blog\/\u603b\u7ed3\u4e86\u6709\u5173git\u7684\u4fe1\u606f\u3002\/\" \/>\n<meta property=\"og:site_name\" content=\"Blog - Silicon Cloud\" \/>\n<meta property=\"article:published_time\" content=\"2023-02-03T02:44:34+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2024-04-28T17:32:30+00:00\" \/>\n<meta name=\"author\" content=\"\u6587, \u7fd4\" \/>\n<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n<meta name=\"twitter:label1\" content=\"\u4f5c\u8005\" \/>\n\t<meta name=\"twitter:data1\" content=\"\u6587, \u7fd4\" \/>\n\t<meta name=\"twitter:label2\" content=\"\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4\" \/>\n\t<meta name=\"twitter:data2\" content=\"2 \u5206\" \/>\n<script type=\"application\/ld+json\" class=\"yoast-schema-graph\">{\"@context\":\"https:\/\/schema.org\",\"@graph\":[{\"@type\":\"WebPage\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e6%80%bb%e7%bb%93%e4%ba%86%e6%9c%89%e5%85%b3git%e7%9a%84%e4%bf%a1%e6%81%af%e3%80%82\/\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e6%80%bb%e7%bb%93%e4%ba%86%e6%9c%89%e5%85%b3git%e7%9a%84%e4%bf%a1%e6%81%af%e3%80%82\/\",\"name\":\"\u603b\u7ed3\u4e86\u6709\u5173Git\u7684\u4fe1\u606f - Blog - Silicon Cloud\",\"isPartOf\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\"},\"datePublished\":\"2023-02-03T02:44:34+00:00\",\"dateModified\":\"2024-04-28T17:32:30+00:00\",\"author\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/64d5cc7727fffbff2f9a2a8da1de3e5c\"},\"breadcrumb\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e6%80%bb%e7%bb%93%e4%ba%86%e6%9c%89%e5%85%b3git%e7%9a%84%e4%bf%a1%e6%81%af%e3%80%82\/#breadcrumb\"},\"inLanguage\":\"zh-Hans\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/www.silicloud.com\/zh\/blog\/%e6%80%bb%e7%bb%93%e4%ba%86%e6%9c%89%e5%85%b3git%e7%9a%84%e4%bf%a1%e6%81%af%e3%80%82\/\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e6%80%bb%e7%bb%93%e4%ba%86%e6%9c%89%e5%85%b3git%e7%9a%84%e4%bf%a1%e6%81%af%e3%80%82\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u9996\u9875\",\"item\":\"https:\/\/www.silicloud.com\/zh\/blog\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"\u603b\u7ed3\u4e86\u6709\u5173Git\u7684\u4fe1\u606f\"}]},{\"@type\":\"WebSite\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/\",\"name\":\"Blog - Silicon Cloud\",\"description\":\"\",\"inLanguage\":\"zh-Hans\"},{\"@type\":\"Person\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/64d5cc7727fffbff2f9a2a8da1de3e5c\",\"name\":\"\u6587, \u7fd4\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/\",\"url\":\"https:\/\/secure.gravatar.com\/avatar\/920c3d673e0bccacc98e5e6b7149bb3c22edd8d39cb753e5d7d7e471498118a1?s=96&d=mm&r=g\",\"contentUrl\":\"https:\/\/secure.gravatar.com\/avatar\/920c3d673e0bccacc98e5e6b7149bb3c22edd8d39cb753e5d7d7e471498118a1?s=96&d=mm&r=g\",\"caption\":\"\u6587, \u7fd4\"},\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/author\/wenxiang\/\"},{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e6%80%bb%e7%bb%93%e4%ba%86%e6%9c%89%e5%85%b3git%e7%9a%84%e4%bf%a1%e6%81%af%e3%80%82\/#local-main-organization-logo\",\"url\":\"\",\"contentUrl\":\"\",\"caption\":\"Blog - Silicon Cloud\"}]}<\/script>\n<!-- \/ Yoast SEO Premium plugin. -->","yoast_head_json":{"title":"\u603b\u7ed3\u4e86\u6709\u5173Git\u7684\u4fe1\u606f - Blog - Silicon Cloud","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.silicloud.com\/zh\/blog\/\u603b\u7ed3\u4e86\u6709\u5173git\u7684\u4fe1\u606f\u3002\/","og_locale":"zh_CN","og_type":"article","og_title":"\u603b\u7ed3\u4e86\u6709\u5173Git\u7684\u4fe1\u606f","og_description":"Git\u7684\u4f5c\u7528\u662f\u4ec0\u4e48\uff1f Git\u662f\u7528\u4e8e\u7ba1\u7406\u6587\u4ef6\u7248\u672c\u7684\u5de5\u5177\u3002\u5b83\u53ef\u4ee5\u5c06\u6587\u4ef6\u4fe1\u606f\u4fdd\u5b58\u4e3a\u5feb\u7167\u3002 \u5b83\u88ab\u7528\u6765\u4e86\u89e3\u6700\u65b0\u7684\u6587\u4ef6\u3001\u9632 [&hellip;]","og_url":"https:\/\/www.silicloud.com\/zh\/blog\/\u603b\u7ed3\u4e86\u6709\u5173git\u7684\u4fe1\u606f\u3002\/","og_site_name":"Blog - Silicon Cloud","article_published_time":"2023-02-03T02:44:34+00:00","article_modified_time":"2024-04-28T17:32:30+00:00","author":"\u6587, \u7fd4","twitter_card":"summary_large_image","twitter_misc":{"\u4f5c\u8005":"\u6587, \u7fd4","\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4":"2 \u5206"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"WebPage","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e6%80%bb%e7%bb%93%e4%ba%86%e6%9c%89%e5%85%b3git%e7%9a%84%e4%bf%a1%e6%81%af%e3%80%82\/","url":"https:\/\/www.silicloud.com\/zh\/blog\/%e6%80%bb%e7%bb%93%e4%ba%86%e6%9c%89%e5%85%b3git%e7%9a%84%e4%bf%a1%e6%81%af%e3%80%82\/","name":"\u603b\u7ed3\u4e86\u6709\u5173Git\u7684\u4fe1\u606f - Blog - Silicon Cloud","isPartOf":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website"},"datePublished":"2023-02-03T02:44:34+00:00","dateModified":"2024-04-28T17:32:30+00:00","author":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/64d5cc7727fffbff2f9a2a8da1de3e5c"},"breadcrumb":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e6%80%bb%e7%bb%93%e4%ba%86%e6%9c%89%e5%85%b3git%e7%9a%84%e4%bf%a1%e6%81%af%e3%80%82\/#breadcrumb"},"inLanguage":"zh-Hans","potentialAction":[{"@type":"ReadAction","target":["https:\/\/www.silicloud.com\/zh\/blog\/%e6%80%bb%e7%bb%93%e4%ba%86%e6%9c%89%e5%85%b3git%e7%9a%84%e4%bf%a1%e6%81%af%e3%80%82\/"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e6%80%bb%e7%bb%93%e4%ba%86%e6%9c%89%e5%85%b3git%e7%9a%84%e4%bf%a1%e6%81%af%e3%80%82\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u9996\u9875","item":"https:\/\/www.silicloud.com\/zh\/blog\/"},{"@type":"ListItem","position":2,"name":"\u603b\u7ed3\u4e86\u6709\u5173Git\u7684\u4fe1\u606f"}]},{"@type":"WebSite","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website","url":"https:\/\/www.silicloud.com\/zh\/blog\/","name":"Blog - Silicon Cloud","description":"","inLanguage":"zh-Hans"},{"@type":"Person","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/64d5cc7727fffbff2f9a2a8da1de3e5c","name":"\u6587, \u7fd4","image":{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/","url":"https:\/\/secure.gravatar.com\/avatar\/920c3d673e0bccacc98e5e6b7149bb3c22edd8d39cb753e5d7d7e471498118a1?s=96&d=mm&r=g","contentUrl":"https:\/\/secure.gravatar.com\/avatar\/920c3d673e0bccacc98e5e6b7149bb3c22edd8d39cb753e5d7d7e471498118a1?s=96&d=mm&r=g","caption":"\u6587, \u7fd4"},"url":"https:\/\/www.silicloud.com\/zh\/blog\/author\/wenxiang\/"},{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e6%80%bb%e7%bb%93%e4%ba%86%e6%9c%89%e5%85%b3git%e7%9a%84%e4%bf%a1%e6%81%af%e3%80%82\/#local-main-organization-logo","url":"","contentUrl":"","caption":"Blog - Silicon Cloud"}]}},"_links":{"self":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37542","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/users\/6"}],"replies":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/comments?post=37542"}],"version-history":[{"count":2,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37542\/revisions"}],"predecessor-version":[{"id":71920,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37542\/revisions\/71920"}],"wp:attachment":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/media?parent=37542"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/categories?post=37542"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/tags?post=37542"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}