{"id":265,"date":"2018-11-21T19:39:37","date_gmt":"2018-11-21T11:39:37","guid":{"rendered":"https:\/\/www.ccagml.com\/?p=265"},"modified":"2019-02-21T10:14:40","modified_gmt":"2019-02-21T02:14:40","slug":"git%e5%9f%ba%e7%a1%80%e7%9f%a5%e8%af%86","status":"publish","type":"post","link":"https:\/\/www.ccagml.com\/?p=265","title":{"rendered":"Git\u57fa\u7840\u77e5\u8bc6"},"content":{"rendered":"<ul>\n<li><a href=\"https:\/\/github.com\/CyC2018\/\" target=\"_blank\" rel=\"noopener\">\u53c2\u8003<\/a><\/li>\n<\/ul>\n<h1>\u96c6\u4e2d\u5f0f\u4e0e\u5206\u5e03\u5f0f<\/h1>\n<p>Git \u5c5e\u4e8e\u5206\u5e03\u5f0f\u7248\u672c\u63a7\u5236\u7cfb\u7edf\uff0c\u800c SVN \u5c5e\u4e8e\u96c6\u4e2d\u5f0f\u3002<\/p>\n<p>\u96c6\u4e2d\u5f0f\u7248\u672c\u63a7\u5236\u53ea\u6709\u4e2d\u5fc3\u670d\u52a1\u5668\u62e5\u6709\u4e00\u4efd\u4ee3\u7801\uff0c\u800c\u5206\u5e03\u5f0f\u7248\u672c\u63a7\u5236\u6bcf\u4e2a\u4eba\u7684\u7535\u8111\u4e0a\u5c31\u6709\u4e00\u4efd\u5b8c\u6574\u7684\u4ee3\u7801\u3002<\/p>\n<p>\u96c6\u4e2d\u5f0f\u7248\u672c\u63a7\u5236\u6709\u5b89\u5168\u6027\u95ee\u9898\uff0c\u5f53\u4e2d\u5fc3\u670d\u52a1\u5668\u6302\u4e86\u6240\u6709\u4eba\u90fd\u6ca1\u529e\u6cd5\u5de5\u4f5c\u4e86\u3002<\/p>\n<p>\u96c6\u4e2d\u5f0f\u7248\u672c\u63a7\u5236\u9700\u8981\u8fde\u7f51\u624d\u80fd\u5de5\u4f5c\uff0c\u5982\u679c\u7f51\u901f\u8fc7\u6162\uff0c\u90a3\u4e48\u63d0\u4ea4\u4e00\u4e2a\u6587\u4ef6\u7684\u4f1a\u6162\u7684\u65e0\u6cd5\u8ba9\u4eba\u5fcd\u53d7\u3002\u800c\u5206\u5e03\u5f0f\u7248\u672c\u63a7\u5236\u4e0d\u9700\u8981\u8fde\u7f51\u5c31\u80fd\u5de5\u4f5c\u3002<\/p>\n<p>\u5206\u5e03\u5f0f\u7248\u672c\u63a7\u5236\u65b0\u5efa\u5206\u652f\u3001\u5408\u5e76\u5206\u652f\u64cd\u4f5c\u901f\u5ea6\u975e\u5e38\u5feb\uff0c\u800c\u96c6\u4e2d\u5f0f\u7248\u672c\u63a7\u5236\u65b0\u5efa\u4e00\u4e2a\u5206\u652f\u76f8\u5f53\u4e8e\u590d\u5236\u4e00\u4efd\u5b8c\u6574\u4ee3\u7801\u3002<\/p>\n<h1>\u4e2d\u5fc3\u670d\u52a1\u5668<\/h1>\n<p>\u4e2d\u5fc3\u670d\u52a1\u5668\u7528\u6765\u4ea4\u6362\u6bcf\u4e2a\u7528\u6237\u7684\u4fee\u6539\uff0c\u6ca1\u6709\u4e2d\u5fc3\u670d\u52a1\u5668\u4e5f\u80fd\u5de5\u4f5c\uff0c\u4f46\u662f\u4e2d\u5fc3\u670d\u52a1\u5668\u80fd\u591f 24 \u5c0f\u65f6\u4fdd\u6301\u5f00\u673a\u72b6\u6001\uff0c\u8fd9\u6837\u5c31\u80fd\u66f4\u65b9\u4fbf\u7684\u4ea4\u6362\u4fee\u6539\u3002<\/p>\n<p>Github \u5c31\u662f\u4e00\u4e2a\u4e2d\u5fc3\u670d\u52a1\u5668\u3002<\/p>\n<h1>\u5de5\u4f5c\u6d41<\/h1>\n<div align=\"center\"> <img src=\"pics\/a1198642-9159-4d88-8aec-c3b04e7a2563.jpg\"\/> <\/div>\n<p><\/p>\n<p>\u65b0\u5efa\u4e00\u4e2a\u4ed3\u5e93\u4e4b\u540e\uff0c\u5f53\u524d\u76ee\u5f55\u5c31\u6210\u4e3a\u4e86\u5de5\u4f5c\u533a\uff0c\u5de5\u4f5c\u533a\u4e0b\u6709\u4e00\u4e2a\u9690\u85cf\u76ee\u5f55 .git\uff0c\u5b83\u5c5e\u4e8e Git \u7684\u7248\u672c\u5e93\u3002<\/p>\n<p>Git \u7248\u672c\u5e93\u6709\u4e00\u4e2a\u79f0\u4e3a stage \u7684\u6682\u5b58\u533a\uff0c\u8fd8\u6709\u81ea\u52a8\u521b\u5efa\u7684 master \u5206\u652f\u4ee5\u53ca\u6307\u5411\u5206\u652f\u7684 HEAD \u6307\u9488\u3002<\/p>\n<div align=\"center\"> <img src=\"pics\/46f66e88-e65a-4ad0-a060-3c63fe22947c.png\"\/> <\/div>\n<p><\/p>\n<ul>\n<li>git add files \u628a\u6587\u4ef6\u7684\u4fee\u6539\u6dfb\u52a0\u5230\u6682\u5b58\u533a<\/li>\n<li>git commit \u628a\u6682\u5b58\u533a\u7684\u4fee\u6539\u63d0\u4ea4\u5230\u5f53\u524d\u5206\u652f\uff0c\u63d0\u4ea4\u4e4b\u540e\u6682\u5b58\u533a\u5c31\u88ab\u6e05\u7a7a\u4e86<\/li>\n<li>git reset &#8212; files \u4f7f\u7528\u5f53\u524d\u5206\u652f\u4e0a\u7684\u4fee\u6539\u8986\u76d6\u6682\u5b58\u533a\uff0c\u7528\u6765\u64a4\u9500\u6700\u540e\u4e00\u6b21 git add files<\/li>\n<li>git checkout &#8212; files \u4f7f\u7528\u6682\u5b58\u533a\u7684\u4fee\u6539\u8986\u76d6\u5de5\u4f5c\u76ee\u5f55\uff0c\u7528\u6765\u64a4\u9500\u672c\u5730\u4fee\u6539<\/li>\n<\/ul>\n<div align=\"center\"> <img src=\"pics\/17976404-95f5-480e-9cb4-250e6aa1d55f.png\"\/> <\/div>\n<p><\/p>\n<p>\u53ef\u4ee5\u8df3\u8fc7\u6682\u5b58\u533a\u57df\u76f4\u63a5\u4ece\u5206\u652f\u4e2d\u53d6\u51fa\u4fee\u6539\uff0c\u6216\u8005\u76f4\u63a5\u63d0\u4ea4\u4fee\u6539\u5230\u5206\u652f\u4e2d\u3002<\/p>\n<ul>\n<li>git commit -a \u76f4\u63a5\u628a\u6240\u6709\u6587\u4ef6\u7684\u4fee\u6539\u6dfb\u52a0\u5230\u6682\u5b58\u533a\u7136\u540e\u6267\u884c\u63d0\u4ea4<\/li>\n<li>git checkout HEAD &#8212; files \u53d6\u51fa\u6700\u540e\u4e00\u6b21\u4fee\u6539\uff0c\u53ef\u4ee5\u7528\u6765\u8fdb\u884c\u56de\u6eda\u64cd\u4f5c<\/li>\n<\/ul>\n<h1>\u5206\u652f\u5b9e\u73b0<\/h1>\n<p>\u4f7f\u7528\u6307\u9488\u5c06\u6bcf\u4e2a\u63d0\u4ea4\u8fde\u63a5\u6210\u4e00\u6761\u65f6\u95f4\u7ebf\uff0cHEAD \u6307\u9488\u6307\u5411\u5f53\u524d\u5206\u652f\u6307\u9488\u3002<\/p>\n<div align=\"center\"> <img src=\"pics\/fb546e12-e1fb-4b72-a1fb-8a7f5000dce6.jpg\"\/> <\/div>\n<p><\/p>\n<p>\u65b0\u5efa\u5206\u652f\u662f\u65b0\u5efa\u4e00\u4e2a\u6307\u9488\u6307\u5411\u65f6\u95f4\u7ebf\u7684\u6700\u540e\u4e00\u4e2a\u8282\u70b9\uff0c\u5e76\u8ba9 HEAD \u6307\u9488\u6307\u5411\u65b0\u5206\u652f\u8868\u793a\u65b0\u5206\u652f\u6210\u4e3a\u5f53\u524d\u5206\u652f\u3002<\/p>\n<div align=\"center\"> <img src=\"pics\/bc775758-89ab-4805-9f9c-78b8739cf780.jpg\"\/> <\/div>\n<p><\/p>\n<p>\u6bcf\u6b21\u63d0\u4ea4\u53ea\u4f1a\u8ba9\u5f53\u524d\u5206\u652f\u6307\u9488\u5411\u524d\u79fb\u52a8\uff0c\u800c\u5176\u5b83\u5206\u652f\u6307\u9488\u4e0d\u4f1a\u79fb\u52a8\u3002<\/p>\n<div align=\"center\"> <img src=\"pics\/5292faa6-0141-4638-bf0f-bb95b081dcba.jpg\"\/> <\/div>\n<p><\/p>\n<p>\u5408\u5e76\u5206\u652f\u4e5f\u53ea\u9700\u8981\u6539\u53d8\u6307\u9488\u5373\u53ef\u3002<\/p>\n<div align=\"center\"> <img src=\"pics\/1164a71f-413d-494a-9cc8-679fb6a2613d.jpg\"\/> <\/div>\n<p><\/p>\n<h1>\u51b2\u7a81<\/h1>\n<p>\u5f53\u4e24\u4e2a\u5206\u652f\u90fd\u5bf9\u540c\u4e00\u4e2a\u6587\u4ef6\u7684\u540c\u4e00\u884c\u8fdb\u884c\u4e86\u4fee\u6539\uff0c\u5728\u5206\u652f\u5408\u5e76\u65f6\u5c31\u4f1a\u4ea7\u751f\u51b2\u7a81\u3002<\/p>\n<div align=\"center\"> <img src=\"pics\/58e57a21-6b6b-40b6-af85-956dd4e0f55a.jpg\"\/> <\/div>\n<p><\/p>\n<p>Git \u4f1a\u4f7f\u7528 &lt;&lt;&lt;&lt;&lt;&lt;&lt; \uff0c======= \uff0c>>>>>>> \u6807\u8bb0\u51fa\u4e0d\u540c\u5206\u652f\u7684\u5185\u5bb9\uff0c\u53ea\u9700\u8981\u628a\u4e0d\u540c\u5206\u652f\u4e2d\u51b2\u7a81\u90e8\u5206\u4fee\u6539\u6210\u4e00\u6837\u5c31\u80fd\u89e3\u51b3\u51b2\u7a81\u3002<\/p>\n<pre class=\"brush: plain; title: ; notranslate\" title=\"\">\n&amp;lt;&amp;lt;&amp;lt;&amp;lt;&amp;lt;&amp;lt;&amp;lt; HEAD\nCreating a new branch is quick &amp;amp; simple.\n=======\nCreating a new branch is quick AND simple.\n&amp;gt;&amp;gt;&amp;gt;&amp;gt;&amp;gt;&amp;gt;&amp;gt; feature1\n<\/pre>\n<h1>Fast forward<\/h1>\n<p>&#8220;\u5feb\u8fdb\u5f0f\u5408\u5e76&#8221;\uff08fast-farward merge\uff09\uff0c\u4f1a\u76f4\u63a5\u5c06 master \u5206\u652f\u6307\u5411\u5408\u5e76\u7684\u5206\u652f\uff0c\u8fd9\u79cd\u6a21\u5f0f\u4e0b\u8fdb\u884c\u5206\u652f\u5408\u5e76\u4f1a\u4e22\u5931\u5206\u652f\u4fe1\u606f\uff0c\u4e5f\u5c31\u4e0d\u80fd\u5728\u5206\u652f\u5386\u53f2\u4e0a\u770b\u51fa\u5206\u652f\u4fe1\u606f\u3002<\/p>\n<p>\u53ef\u4ee5\u5728\u5408\u5e76\u65f6\u52a0\u4e0a &#8211;no-ff \u53c2\u6570\u6765\u7981\u7528 Fast forward \u6a21\u5f0f\uff0c\u5e76\u4e14\u52a0\u4e0a -m \u53c2\u6570\u8ba9\u5408\u5e76\u65f6\u4ea7\u751f\u4e00\u4e2a\u65b0\u7684 commit\u3002<\/p>\n<pre class=\"brush: plain; title: ; notranslate\" title=\"\">\n$ git merge --no-ff -m &amp;quot;merge with no-ff&amp;quot; dev\n<\/pre>\n<div align=\"center\"> <img src=\"pics\/dd78a1fe-1ff3-4bcf-a56f-8c003995beb6.jpg\"\/> <\/div>\n<p><\/p>\n<h1>\u5206\u652f\u7ba1\u7406\u7b56\u7565<\/h1>\n<p>master \u5206\u652f\u5e94\u8be5\u662f\u975e\u5e38\u7a33\u5b9a\u7684\uff0c\u53ea\u7528\u6765\u53d1\u5e03\u65b0\u7248\u672c\uff1b<\/p>\n<p>\u65e5\u5e38\u5f00\u53d1\u5728\u5f00\u53d1\u5206\u652f dev \u4e0a\u8fdb\u884c\u3002<\/p>\n<div align=\"center\"> <img src=\"pics\/245fd2fb-209c-4ad5-bc5e-eb5664966a0e.jpg\"\/> <\/div>\n<p><\/p>\n<h1>\u50a8\u85cf\uff08Stashing\uff09<\/h1>\n<p>\u5728\u4e00\u4e2a\u5206\u652f\u4e0a\u64cd\u4f5c\u4e4b\u540e\uff0c\u5982\u679c\u8fd8\u6ca1\u6709\u5c06\u4fee\u6539\u63d0\u4ea4\u5230\u5206\u652f\u4e0a\uff0c\u6b64\u65f6\u8fdb\u884c\u5207\u6362\u5206\u652f\uff0c\u90a3\u4e48\u53e6\u4e00\u4e2a\u5206\u652f\u4e0a\u4e5f\u80fd\u770b\u5230\u65b0\u7684\u4fee\u6539\u3002\u8fd9\u662f\u56e0\u4e3a\u6240\u6709\u5206\u652f\u90fd\u5171\u7528\u4e00\u4e2a\u5de5\u4f5c\u533a\u7684\u7f18\u6545\u3002<\/p>\n<p>\u53ef\u4ee5\u4f7f\u7528 git stash \u5c06\u5f53\u524d\u5206\u652f\u7684\u4fee\u6539\u50a8\u85cf\u8d77\u6765\uff0c\u6b64\u65f6\u5f53\u524d\u5de5\u4f5c\u533a\u7684\u6240\u6709\u4fee\u6539\u90fd\u4f1a\u88ab\u5b58\u5230\u6808\u4e0a\uff0c\u4e5f\u5c31\u662f\u8bf4\u5f53\u524d\u5de5\u4f5c\u533a\u662f\u5e72\u51c0\u7684\uff0c\u6ca1\u6709\u4efb\u4f55\u672a\u63d0\u4ea4\u7684\u4fee\u6539\u3002\u6b64\u65f6\u5c31\u53ef\u4ee5\u5b89\u5168\u7684\u5207\u6362\u5230\u5176\u5b83\u5206\u652f\u4e0a\u4e86\u3002<\/p>\n<pre class=\"brush: plain; title: ; notranslate\" title=\"\">\n$ git stash\nSaved working directory and index state \\ &amp;quot;WIP on master: 049d078 added the index file&amp;quot;\nHEAD is now at 049d078 added the index file (To restore them type &amp;quot;git stash apply&amp;quot;)\n<\/pre>\n<p>\u8be5\u529f\u80fd\u53ef\u4ee5\u7528\u4e8e bug \u5206\u652f\u7684\u5b9e\u73b0\u3002\u5982\u679c\u5f53\u524d\u6b63\u5728 dev \u5206\u652f\u4e0a\u8fdb\u884c\u5f00\u53d1\uff0c\u4f46\u662f\u6b64\u65f6 master \u4e0a\u6709\u4e2a bug \u9700\u8981\u4fee\u590d\uff0c\u4f46\u662f dev \u5206\u652f\u4e0a\u7684\u5f00\u53d1\u8fd8\u672a\u5b8c\u6210\uff0c\u4e0d\u60f3\u7acb\u5373\u63d0\u4ea4\u3002\u5728\u65b0\u5efa bug \u5206\u652f\u5e76\u5207\u6362\u5230 bug \u5206\u652f\u4e4b\u524d\u5c31\u9700\u8981\u4f7f\u7528 git stash \u5c06 dev \u5206\u652f\u7684\u672a\u63d0\u4ea4\u4fee\u6539\u50a8\u85cf\u8d77\u6765\u3002<\/p>\n<h1>SSH \u4f20\u8f93\u8bbe\u7f6e<\/h1>\n<p>Git \u4ed3\u5e93\u548c Github \u4e2d\u5fc3\u4ed3\u5e93\u4e4b\u95f4\u7684\u4f20\u8f93\u662f\u901a\u8fc7 SSH \u52a0\u5bc6\u3002<\/p>\n<p>\u5982\u679c\u5de5\u4f5c\u533a\u4e0b\u6ca1\u6709 .ssh \u76ee\u5f55\uff0c\u6216\u8005\u8be5\u76ee\u5f55\u4e0b\u6ca1\u6709 id_rsa \u548c id_rsa.pub \u8fd9\u4e24\u4e2a\u6587\u4ef6\uff0c\u53ef\u4ee5\u901a\u8fc7\u4ee5\u4e0b\u547d\u4ee4\u6765\u521b\u5efa SSH Key\uff1a<\/p>\n<pre class=\"brush: plain; title: ; notranslate\" title=\"\">\n$ ssh-keygen -t rsa -C &amp;quot;youremail@example.com&amp;quot;\n<\/pre>\n<p>\u7136\u540e\u628a\u516c\u94a5 id_rsa.pub \u7684\u5185\u5bb9\u590d\u5236\u5230 Github &#8220;Account settings&#8221; \u7684 SSH Keys \u4e2d\u3002<\/p>\n<h1>.gitignore \u6587\u4ef6<\/h1>\n<p>\u5ffd\u7565\u4ee5\u4e0b\u6587\u4ef6\uff1a<\/p>\n<ul>\n<li>\u64cd\u4f5c\u7cfb\u7edf\u81ea\u52a8\u751f\u6210\u7684\u6587\u4ef6\uff0c\u6bd4\u5982\u7f29\u7565\u56fe\uff1b<\/li>\n<li>\u7f16\u8bd1\u751f\u6210\u7684\u4e2d\u95f4\u6587\u4ef6\uff0c\u6bd4\u5982 Java \u7f16\u8bd1\u4ea7\u751f\u7684 .class \u6587\u4ef6\uff1b<\/li>\n<li>\u81ea\u5df1\u7684\u654f\u611f\u4fe1\u606f\uff0c\u6bd4\u5982\u5b58\u653e\u53e3\u4ee4\u7684\u914d\u7f6e\u6587\u4ef6\u3002<\/li>\n<\/ul>\n<p>\u4e0d\u9700\u8981\u5168\u90e8\u81ea\u5df1\u7f16\u5199\uff0c\u53ef\u4ee5\u5230 <a href=\"https:\/\/github.com\/github\/gitignore\" target=\"_blank\" rel=\"noopener\">https:\/\/github.com\/github\/gitignore<\/a> \u4e2d\u8fdb\u884c\u67e5\u8be2\u3002<\/p>\n<h1>Git \u547d\u4ee4\u4e00\u89c8<\/h1>\n<div align=\"center\"> <img src=\"pics\/7a29acce-f243-4914-9f00-f2988c528412.jpg\"\/> <\/div>\n<p><\/p>\n<p>\u6bd4\u8f83\u8be6\u7ec6\u7684\u5730\u5740\uff1ahttp:\/\/www.cheat-sheets.org\/saved-copy\/git-cheat-sheet.pdf<\/p>\n<h1>\u53c2\u8003\u8d44\u6599<\/h1>\n<ul>\n<li><a href=\"http:\/\/rogerdudler.github.io\/git-guide\/index.zh.html\" target=\"_blank\" rel=\"noopener\">Git &#8211; \u7b80\u660e\u6307\u5357<\/a><\/li>\n<li><a href=\"http:\/\/marklodato.github.io\/visual-git-guide\/index-zh-cn.html\" target=\"_blank\" rel=\"noopener\">\u56fe\u89e3 Git<\/a><\/li>\n<li><a href=\"https:\/\/www.liaoxuefeng.com\/wiki\/0013739516305929606dd18361248578c67b8067c8c017b000\" target=\"_blank\" rel=\"noopener\">\u5ed6\u96ea\u5cf0 : Git \u6559\u7a0b<\/a><\/li>\n<li><a href=\"https:\/\/learngitbranching.js.org\/\" target=\"_blank\" rel=\"noopener\">Learn Git Branching<\/a><\/li>\n<\/ul>\n","protected":false},"excerpt":{"rendered":"<p>\u53c2\u8003 \u96c6\u4e2d\u5f0f\u4e0e\u5206\u5e03\u5f0f Git \u5c5e\u4e8e\u5206\u5e03\u5f0f\u7248\u672c\u63a7\u5236\u7cfb\u7edf\uff0c\u800c SVN \u5c5e\u4e8e\u96c6\u4e2d\u5f0f\u3002 \u96c6\u4e2d\u5f0f\u7248\u672c\u63a7\u5236\u53ea\u6709\u4e2d\u5fc3\u670d\u52a1\u5668\u62e5<a href=\"https:\/\/www.ccagml.com\/?p=265\" class=\"more-link\">Continue reading <span class=\"screen-reader-text\">Git\u57fa\u7840\u77e5\u8bc6<\/span><\/a><\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":[],"categories":[28,25],"tags":[],"_links":{"self":[{"href":"https:\/\/www.ccagml.com\/index.php?rest_route=\/wp\/v2\/posts\/265"}],"collection":[{"href":"https:\/\/www.ccagml.com\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.ccagml.com\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.ccagml.com\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/www.ccagml.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=265"}],"version-history":[{"count":3,"href":"https:\/\/www.ccagml.com\/index.php?rest_route=\/wp\/v2\/posts\/265\/revisions"}],"predecessor-version":[{"id":290,"href":"https:\/\/www.ccagml.com\/index.php?rest_route=\/wp\/v2\/posts\/265\/revisions\/290"}],"wp:attachment":[{"href":"https:\/\/www.ccagml.com\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=265"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.ccagml.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=265"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.ccagml.com\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=265"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}