\u4e00\uff1agit\u529f\u80fd\u533a
\nWorkspace\uff1a\u5de5\u4f5c\u533a
\nIndex \/ Stage\uff1a\u6682\u5b58\u533a
\nRepository\uff1a\u4ed3\u5e93\u533a\uff08\u6216\u672c\u5730\u4ed3\u5e93\uff09
\nRemote\uff1a\u8fdc\u7a0b\u4ed3\u5e93
\n\u4e8c\u64cd\u4f5c
\n1.\u521b\u5efa\u7248\u672c\u5e93
\ngit init –\u521b\u5efagit\u4ed3\u5e93
\ngit add readme.txt –\u63d0\u4ea4\u6587\u4ef6\u5230\u6682\u5b58\u533a
\ngit add . \u4e00\u6b21\u6027\u63d0\u4ea4
\ngit commit -m ‘first commit’ –\u63d0\u4ea4\u5230\u4ed3\u5e93
\ngit status –\u67e5\u770b\u662f\u5426\u6709\u6587\u4ef6\u63d0\u4ea4
\ngit diff readme.txt \u67e5\u770b\u4fee\u6539
\n2 \u7248\u672c\u52a0\u9000
\ngit log \u67e5\u770b\u65e5\u5fd7
\ngit log –pretty=oneline \u4e00\u884c\u663e\u793a
\ngit reset –hard HEAD^ \u90a3\u4e48\u5982\u679c\u8981\u56de\u9000\u5230\u4e0a\u4e0a\u4e2a\u7248\u672c\u53ea\u9700\u628aHEAD^ \u6539\u6210 HEAD^^ \u4ee5\u6b64\u7c7b\u63a8\u3002
\ngit reset –hard \u7248\u672c\u53f7
\ngit reflog \u67e5\u770b\u5df2\u56de\u9000\u7684\u7248\u672c\u53f7
\n3 \u5de5\u4f5c\u533a\u548c\u6682\u5b58\u533a
\n\u547d\u4ee4 git checkout –readme.txt \u610f\u601d\u5c31\u662f\uff0c\u628areadme.txt\u6587\u4ef6\u5728\u5de5\u4f5c\u533a\u505a\u7684\u4fee\u6539\u5168\u90e8\u64a4\u9500\uff0c\u8fd9\u91cc\u67092\u79cd\u60c5\u51b5\uff0c\u5982\u4e0b\uff1a
\n1.readme.txt\u81ea\u52a8\u4fee\u6539\u540e\uff0c\u8fd8\u6ca1\u6709\u653e\u5230\u6682\u5b58\u533a\uff0c\u4f7f\u7528 \u64a4\u9500\u4fee\u6539\u5c31\u56de\u5230\u548c\u7248\u672c\u5e93\u4e00\u6a21\u4e00\u6837\u7684\u72b6\u6001\u3002
\n2.\u53e6\u5916\u4e00\u79cd\u662freadme.txt\u5df2\u7ecf\u653e\u5165\u6682\u5b58\u533a\u4e86\uff0c\u63a5\u7740\u53c8\u4f5c\u4e86\u4fee\u6539\uff0c\u64a4\u9500\u4fee\u6539\u5c31\u56de\u5230\u6dfb\u52a0\u6682\u5b58\u533a\u540e\u7684\u72b6\u6001\u3002
\n\u6ce8\u610f\uff1a\u547d\u4ee4git checkout — readme.txt \u4e2d\u7684 — \u5f88\u91cd\u8981\uff0c\u5982\u679c\u6ca1\u6709 — \u7684\u8bdd\uff0c\u90a3\u4e48\u547d\u4ee4\u53d8\u6210\u521b\u5efa\u5206\u652f\u4e86\u3002<\/p>\n
4 \u5220\u9664\u6587\u4ef6
\nrm b.txt
\ngit commit -m ‘\u63d0\u4ea4\u5220\u9664’
\ngit checkout — b.txt \u6062\u590d
\n5 \u8fdc\u7a0b\u4ed3\u5e93
\nGithub or gittee Create Repository
\ngen SSH Key on Site,and setting to localhost git Settings
\n\u73b0\u5728\uff0c\u6211\u4eec\u6839\u636eGitHub\u7684\u63d0\u793a\uff0c\u5728\u672c\u5730\u7684testgit\u4ed3\u5e93\u4e0b\u8fd0\u884c\u547d\u4ee4\uff1a
\n$ git remote add origin https:\/\/github.com\/yourusername\/repotest.git
\n\u628a\u672c\u5730\u5e93\u7684\u5185\u5bb9\u63a8\u9001\u5230\u8fdc\u7a0b\uff0c\u4f7f\u7528 git push -u origin master\u547d\u4ee4\uff0c\u5b9e\u9645\u4e0a\u662f\u628a\u5f53\u524d\u5206\u652fmaster\u63a8\u9001\u5230\u8fdc\u7a0b\u3002<\/p>\n
\u4ece\u73b0\u5728\u8d77\uff0c\u53ea\u8981\u672c\u5730\u4f5c\u4e86\u63d0\u4ea4\uff0c\u5c31\u53ef\u4ee5\u901a\u8fc7\u5982\u4e0b\u547d\u4ee4\uff1agit push origin master
\n\u628a\u672c\u5730master\u5206\u652f\u7684\u6700\u65b0\u4fee\u6539\u63a8\u9001\u5230github\u4e0a\u4e86\uff0c\u73b0\u5728\u4f60\u5c31\u62e5\u6709\u4e86\u771f\u6b63\u7684\u5206\u5e03\u5f0f\u7248\u672c\u5e93\u4e86\u3002
\n\u901a\u8fc7git clone https:\/\/github.com\/jjleee\/gittest.git\u53ef\u4ee5\u4ece\u8fdc\u7a0b\u4ed3\u5e93\u514b\u9686\u5230\u672c\u5730\u3002
\n6\u521b\u5efa\u548c\u5408\u5e76\u5206\u652f
\ngit checkout -b dev(\u76f8\u5f53\u4e8e git branch dev & git checkout dev) \u2013b\u53c2\u6570\u8868\u793a\u521b\u5efa\u5e76\u5207\u6362
\ngit branch \u67e5\u770b\u5206\u652f
\ngit checkout master\uff08\u5207\u6362\u5230master\uff09
\ngit merge dev \u628adev\u5185\u5bb9\u5408\u5e76\u5230master\u4e0a(git merge\u547d\u4ee4\u7528\u4e8e\u5408\u5e76\u6307\u5b9a\u5206\u652f\u5230\u5f53\u524d\u5206\u652f\u4e0a)
\ngit branch -d dev \u5220\u9664dev\u5206\u652f
\n\u603b\u7ed3\u521b\u5efa\u4e0e\u5408\u5e76\u5206\u652f\u547d\u4ee4\u5982\u4e0b\uff1a
\n\u67e5\u770b\u5206\u652f\uff1agit branch
\n\u521b\u5efa\u5206\u652f\uff1agit branch name
\n\u5207\u6362\u5206\u652f\uff1agit checkout name
\n\u521b\u5efa+\u5207\u6362\u5206\u652f\uff1agit checkout \u2013b name
\n\u5408\u5e76\u67d0\u5206\u652f\u5230\u5f53\u524d\u5206\u652f\uff1agit merge name
\n\u5220\u9664\u5206\u652f\uff1agit branch \u2013d name
\ngit log\u67e5\u770b\u5408\u5e76\u7684\u65e5\u5fd7
\n\u901a\u5e38\u5408\u5e76\u5206\u652f\u65f6\uff0cgit\u4e00\u822c\u4f7f\u7528\u201dFast forward\u201d\u6a21\u5f0f\uff0c\u5728\u8fd9\u79cd\u6a21\u5f0f\u4e0b\uff0c\u5220\u9664\u5206\u652f\u540e\uff0c\u4f1a\u4e22\u6389\u5206\u652f\u4fe1\u606f\uff0c\u53ef\u4f7f\u7528\u5e26\u53c2\u6570 \u2013no-ff\u6765\u7981\u7528\u201dFast forward\u201d\u6a21\u5f0f\u3002
\n7 bug\u5206\u652f
\ngit checkout -b bug
\ngit status
\ngit stash
\n\u73b0\u5728\u6211\u4eec\u53ef\u4ee5\u901a\u8fc7\u521b\u5efaissue-404\u5206\u652f\u6765\u4fee\u590dbug\u4e86\u3002
\ngit checkout -b issue-404
\ngit add .
\ngit commit -m ‘\u4fee\u590dissue-404’
\ngit checkout master
\ngit merge –no-f -m ‘merge issue404 bug fix’
\ngit merge –no-f -m ‘merge issue404 bug fix’ issue-404
\ngit branch -d issue-404
\n\u73b0\u5728\uff0c\u6211\u4eec\u56de\u5230bug\u5206\u652f\u4e0a\u5e72\u6d3b\u4e86\u3002\u5de5\u4f5c\u533a\u662f\u5e72\u51c0\u7684\uff0c\u6211\u4eec\u53ef\u4ee5\u4f7f\u7528\u547d\u4ee4 git stash list\u6765\u67e5\u770b\u5de5\u4f5c\u73b0\u573a\u3002\u5982\u4e0b
\ngit checkout bug
\ngit status
\ngit stash list
\n\u5de5\u4f5c\u73b0\u573a\u8fd8\u5728\uff0cGit\u628astash\u5185\u5bb9\u5b58\u5728\u67d0\u4e2a\u5730\u65b9\u4e86\uff0c\u4f46\u662f\u9700\u8981\u6062\u590d\u4e00\u4e0b\uff0c\u53ef\u4ee5\u4f7f\u7528\u5982\u4e0b2\u4e2a\u65b9\u6cd5\uff1a
\n1.git stash apply\u6062\u590d\uff0c\u6062\u590d\u540e\uff0cstash\u5185\u5bb9\u5e76\u4e0d\u5220\u9664\uff0c\u4f60\u9700\u8981\u4f7f\u7528\u547d\u4ee4git stash drop\u6765\u5220\u9664\u3002
\n2.\u53e6\u4e00\u79cd\u65b9\u5f0f\u662f\u4f7f\u7528git stash pop,\u6062\u590d\u7684\u540c\u65f6\u628astash\u5185\u5bb9\u4e5f\u5220\u9664\u4e86\u3002
\n8\u591a\u4eba\u534f\u4f5c
\n\u5f53\u4f60\u4ece\u8fdc\u7a0b\u5e93\u514b\u9686\u65f6\u5019\uff0c\u5b9e\u9645\u4e0aGit\u81ea\u52a8\u628a\u672c\u5730\u7684master\u5206\u652f\u548c\u8fdc\u7a0b\u7684master\u5206\u652f\u5bf9\u5e94\u8d77\u6765\u4e86\uff0c\u5e76\u4e14\u8fdc\u7a0b\u5e93\u7684\u9ed8\u8ba4\u540d\u79f0\u662forigin\u3002
\n\u8981\u67e5\u770b\u8fdc\u7a0b\u5e93\u7684\u4fe1\u606f \u4f7f\u7528 git remote
\n\u8981\u67e5\u770b\u8fdc\u7a0b\u5e93\u7684\u8be6\u7ec6\u4fe1\u606f \u4f7f\u7528 git remote \u2013v
\n8.1 \u63a8\u9001\u5206\u652f\u5c31\u662f\u628a\u8be5\u5206\u652f\u4e0a\u6240\u6709\u672c\u5730\u63d0\u4ea4\u5230\u8fdc\u7a0b\u5e93\u4e2d\uff0c\u63a8\u9001\u65f6\uff0c\u8981\u6307\u5b9a\u672c\u5730\u5206\u652f\uff0c\u8fd9\u6837\uff0cGit\u5c31\u4f1a\u628a\u8be5\u5206\u652f\u63a8\u9001\u5230\u8fdc\u7a0b\u5e93\u5bf9\u5e94\u7684\u8fdc\u7a0b\u5206\u652f\u4e0a\uff1a \u4f7f\u7528\u547d\u4ee4
\ngit push origin master
\n\u63a8\u9001dev\u5206\u652f git push origin dev
\n8.2\u62c9\u53d6
\ngit clone https:\/\/github.com\/yourusername\/repotest.git\u53ef\u4ee5\u4ece\u8fdc\u7a0b\u4ed3\u5e93\u514b\u9686\u5230\u672c\u5730\u3002
\n\u4f7f\u7528\u547d\u4ee4\u521b\u5efa\u672c\u5730dev\u5206\u652f\uff1a
\ngit checkout \u2013b dev origin\/dev
\n\u5408\u5e76\u51b2\u7a81
\ngit branch –set-upstream-to=origin\/dev dev \u672c\u5730\u5206\u652f\u4e0e\u8fdc\u7a0b\u5206\u652f\u94fe\u63a5
\n\u9996\u5148\uff0c\u53ef\u4ee5\u8bd5\u56fe\u7528git push origin branch-name\u63a8\u9001\u81ea\u5df1\u7684\u4fee\u6539.
\n\u5982\u679c\u63a8\u9001\u5931\u8d25\uff0c\u5219\u56e0\u4e3a\u8fdc\u7a0b\u5206\u652f\u6bd4\u4f60\u7684\u672c\u5730\u66f4\u65b0\u65e9\uff0c\u9700\u8981\u5148\u7528git pull\u8bd5\u56fe\u5408\u5e76\u3002
\n\u5982\u679c\u5408\u5e76\u6709\u51b2\u7a81\uff0c\u5219\u9700\u8981\u89e3\u51b3\u51b2\u7a81\uff0c\u5e76\u5728\u672c\u5730\u63d0\u4ea4\u3002\u518d\u7528git push origin branch-name\u63a8\u9001\u3002<\/p>\n
\u51fa\u8655\uff1ahttps:\/\/www.cnblogs.com\/jjlee\/p\/10305194.html<\/p>\n","protected":false},"excerpt":{"rendered":"
\u4e00\uff1agit\u529f\u80fd\u533a Workspace\uff1a\u5de5\u4f5c\u533a Index \/ Stage\uff1a\u6682\u5b58\u533a Repository\uff1a\u4ed3\u5e93\u533a\uff08\u6216\u672c\u5730\u4ed3\u5e93\uff09 Remote\uff1a\u8fdc\u7a0b\u4ed3\u5e93 \u4e8c\u64cd\u4f5c 1.\u521b\u5efa\u7248\u672c\u5e93 git init –\u521b\u5efagit\u4ed3\u5e93 git add readme.txt –\u63d0\u4ea4\u6587\u4ef6\u5230\u6682\u5b58\u533a git add . \u4e00\u6b21\u6027\u63d0\u4ea4 git commit -m ‘first commit’ –\u63d0\u4ea4\u5230\u4ed3\u5e93 git status –\u67e5\u770b\u662f\u5426\u6709\u6587\u4ef6\u63d0\u4ea4 git diff readme.txt \u67e5\u770b\u4fee\u6539 2 \u7248\u672c\u52a0\u9000 git log \u67e5\u770b\u65e5\u5fd7 git log –pretty=oneline \u4e00\u884c\u663e\u793a git reset –hard HEAD^ \u90a3\u4e48\u5982\u679c\u8981\u56de\u9000\u5230\u4e0a\u4e0a\u4e2a\u7248\u672c\u53ea\u9700\u628aHEAD^ \u6539\u6210 HEAD^^ \u4ee5\u6b64\u7c7b\u63a8\u3002 git reset –hard \u7248\u672c\u53f7 git … Read more<\/a><\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[18],"tags":[],"class_list":["post-451","post","type-post","status-publish","format-standard","hentry","category-git"],"_links":{"self":[{"href":"http:\/\/22pig.com\/index.php?rest_route=\/wp\/v2\/posts\/451","targetHints":{"allow":["GET"]}}],"collection":[{"href":"http:\/\/22pig.com\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"http:\/\/22pig.com\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"http:\/\/22pig.com\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"http:\/\/22pig.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=451"}],"version-history":[{"count":4,"href":"http:\/\/22pig.com\/index.php?rest_route=\/wp\/v2\/posts\/451\/revisions"}],"predecessor-version":[{"id":806,"href":"http:\/\/22pig.com\/index.php?rest_route=\/wp\/v2\/posts\/451\/revisions\/806"}],"wp:attachment":[{"href":"http:\/\/22pig.com\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=451"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/22pig.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=451"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/22pig.com\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=451"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}