{"id":37481,"date":"2023-09-22T15:45:40","date_gmt":"2023-09-25T07:33:56","guid":{"rendered":"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e5%9f%ba%e7%a1%80\/"},"modified":"2024-01-15T09:30:08","modified_gmt":"2024-01-15T01:30:08","slug":"git%e7%9a%84%e5%9f%ba%e7%a1%80","status":"publish","type":"post","link":"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e5%9f%ba%e7%a1%80\/","title":{"rendered":"Git\u7684\u57fa\u7840"},"content":{"rendered":"

\u914d\u7f6egit<\/h2>\n

\u4e00\u4e9b Git \u57fa\u672c\u914d\u7f6e<\/p>\n

git config --global<\/span> user.name \"Nguyen Van A\"<\/span>\r\ngit config --global<\/span> user.email nguyen_van_a@example.com\r\ngit config --global<\/span> core.editor notepad++\r\ngit config --global<\/span> help.autocorrect 1\r\ngit config --global<\/span> core.autocrlf false<\/span>\r\n\r\n# list all global config<\/span>\r\ngit config --global<\/span> --list<\/span>\r\n<\/code><\/pre>\n
\u5728\u672c\u5730\u4f7f\u7528git\u8fdb\u884c\u5de5\u4f5c<\/h2>\n
\u521d\u59cb\u5316 – \u72b6\u6001 – \u6dfb\u52a0 – \u63d0\u4ea4 – \u65e5\u5fd7<\/h3>\n
    Create a local repo<\/ul>\n
    git init\r\n<\/code><\/pre>\n
      See untracked files<\/ul>\n
      git status\r\n<\/code><\/pre>\n
        Add (stage) a file to commit it<\/ul>\n
        git add file_name\r\n<\/code><\/pre>\n
        \u63d0\u4ea4\u6587\u4ef6<\/p>\n
        git commit -m \"message\"\r\n<\/code><\/pre>\n
          See commit log<\/ul>\n
          git log\r\n<\/code><\/pre>\n
            Add (stage) all modified (updated) files to commit<\/ul>\n
            git add -u\r\n<\/code><\/pre>\n
              Then commit it to local repo<\/ul>\n
              git commit -m \"message\"\r\n<\/code><\/pre>\n
                Add (stage) all changed files (including new files)<\/ul>\n
                git add -A\r\n<\/code><\/pre>\n
                  Then commit them<\/ul>\n
                  git commit -m \"message\"\r\n<\/code><\/pre>\n
                  \u5c55\u793a\u5dee\u5f02<\/h3>\n
                    See changes between 2 commits<\/ul>\n
                    git diff 1st_commit_number..2nd_commit_number\r\n<\/code><\/pre>\n
                      Or<\/ul>\n
                      git diff HEAD~1..[HEAD]\r\n<\/code><\/pre>\n
                      \uff08\u67e5\u770bHEAD\u548c\u524d\u4e00\u4e2a\u63d0\u4ea4\u4e4b\u95f4\u7684\u5dee\u5f02\uff09<\/p>\n
                        Add (stage) a file to commit<\/ul>\n
                        git add file_name\r\n<\/code><\/pre>\n
                          See staged changes<\/ul>\n
                          git diff --cached\r\n<\/code><\/pre>\n
                            See changes of a commit<\/ul>\n
                            git show commit_number\r\n<\/code><\/pre>\n
                              Or<\/ul>\n
                              git show HEAD\r\n<\/code><\/pre>\n
                              \u6dfb\u52a0-\u91cd\u7f6e\u8f6f\u4ef6 –<\/h3>\n
                                Add (stage) a file to commit<\/ul>\n
                                git add file_name\r\n<\/code><\/pre>\n
                                  But want to unstage it after that<\/ul>\n
                                  git reset --soft\r\n<\/code><\/pre>\n
                                  \u7ed3\u8d26 – \u5206\u652f<\/h3>\n
                                    Create a new branch from the current branch<\/ul>\n
                                    git checkout -b new_branch_name\r\n<\/code><\/pre>\n
                                      See available branches at local<\/ul>\n
                                      git branch\r\n<\/code><\/pre>\n
                                        Checkout to another local branch<\/ul>\n
                                        git checkout a_branch\r\n<\/code><\/pre>\n
                                          Rename the current branch<\/ul>\n
                                          git branch -m new_name\r\n<\/code><\/pre>\n
                                            Delete a local branch<\/ul>\n
                                            git branch -d branch_to_delete\r\n<\/code><\/pre>\n
                                            \u7ed3\u5e10 – \u5f3a\u5236\u91cd\u7f6e<\/h3>\n
                                              Checkout to remove uncommitted changes of a file to HEAD<\/ul>\n
                                              git checkout file_name\r\n<\/code><\/pre>\n
                                                Reset to remove all uncommitted changes (of all files)<\/ul>\n
                                                git reset --hard\r\n<\/code><\/pre>\n
                                                  Move the HEAD back 1 commit<\/ul>\n
                                                  git reset --hard HEAD~1\r\n<\/code><\/pre>\n
                                                  \u5408\u5e76<\/h3>\n
                                                    Merge a branch to the current branch<\/ul>\n
                                                    git merge the_branch_to_merge_to_current_branch\r\n<\/code><\/pre>\n
                                                      After that delete the merged branch<\/ul>\n
                                                      git branch -d the_branch_merged_to_current_branch\r\n<\/code><\/pre>\n
                                                      \u4f7f\u7528\u8fdc\u7a0bgit\u8fdb\u884c\u8fdc\u7a0b\u5de5\u4f5c<\/h2>\n
                                                        Clone a repo<\/ul>\n
                                                        git clone url_of_the_repo\r\n<\/code><\/pre>\n
                                                          See commit history of the project<\/ul>\n
                                                          cd <\/span>to_the_cloned_project\r\ngit log \r\n<\/code><\/pre>\n
                                                            Check what is remoted<\/ul>\n
                                                            git remote -v\r\n<\/code><\/pre>\n
                                                              fetch new branches… from remote repo<\/ul>\n
                                                              git fetch\r\n<\/code><\/pre>\n
                                                                View remote branches<\/ul>\n
                                                                git branch -r\r\n<\/code><\/pre>\n
                                                                  Create a local branch from a remote branch<\/ul>\n
                                                                  git checkout remote_branch # Will create a local branch that tracks the remote branch<\/span>\r\n<\/code><\/pre>\n
                                                                    \n
                                                                  • \n
                                                                      Make some changes then commit to the local branch (see Working locally with git)<\/ul>\n<\/li>\n<\/ul>\n
                                                                       <\/p>\n
                                                                        Push committed content back to the remote branch<\/ul>\n
                                                                        git push\r\n<\/code><\/pre>\n
                                                                          Pull changes of the remote branch to the local branch<\/ul>\n
                                                                          git pull\r\n<\/code><\/pre>\n
                                                                            Clean remote branches that have been deleted from the remote repo<\/ul>\n
                                                                            git remote prune [remote_repo_name]\r\n<\/code><\/pre>\n
                                                                            (remote_repo_name\u7684\u540d\u79f0\u662f\u7c7b\u4f3c\u4e8eorigin)<\/p>\n
                                                                            \u8fdb\u4e00\u6b65\u638c\u63e1Git<\/h2>\n
                                                                            \u85cf\u533f<\/h3>\n
                                                                            \u5982\u679c<\/p>\n
                                                                              \n
                                                                            • \n
                                                                                You are working on a branch<\/ul>\n<\/li>\n<\/ul>\n
                                                                                 <\/p>\n
                                                                                  \n
                                                                                • \n
                                                                                    You have some uncommited changes<\/ul>\n<\/li>\n<\/ul>\n
                                                                                     <\/p>\n
                                                                                      \n
                                                                                    • \n
                                                                                        And the changes are not ready to commit<\/ul>\n<\/li>\n<\/ul>\n
                                                                                         <\/p>\n
                                                                                          Then you have to checkout another branch to fix something (that is urgent)<\/ul>\n
                                                                                          \u4f60\u53ef\u4ee5\u5c06\u66f4\u6539\u6682\u5b58\u4ee5\u5907\u540e\u7eed\u63d0\u4ea4<\/p>\n
                                                                                          git stash\u662f\u5c06\u4fee\u6539\u5185\u5bb9\u4fdd\u5b58\u5230stash\u4e2d<\/p>\n
                                                                                          \u67e5\u770b\u5f53\u524d\u6682\u5b58\u5217\u8868<\/p>\n
                                                                                          \u4ece\u5b58\u50a8\u5217\u8868\u4e2d\u53d6\u51fa\u4e00\u4e2a\u5b58\u50a8\uff0c\u5e76\u5e94\u7528\u5230\u4f60\u7684\u4ee3\u7801\u4e2d\uff0c\u4f46\u4e0d\u4ece\u5b58\u50a8\u5217\u8868\u4e2d\u79fb\u9664\u3002<\/p>\n
                                                                                          \u53d6\u51fa\u4e00\u4e2a\u50a8\u85cf\uff08stash\uff09\uff0c\u5c06\u5176\u4ece\u50a8\u85cf\u5217\u8868\u4e2d\u79fb\u9664\u3002<\/p>\n
                                                                                          \u5220\u9664\u4e00\u4e2a\u5b58\u50a8<\/p>\n
                                                                                          \u6311\u9009\u6700\u597d\u7684\/\u4f18\u8d28\u7684<\/h3>\n
                                                                                          \u5982\u679c\uff1a<\/p>\n
                                                                                            \n
                                                                                          • \n
                                                                                              You have commitA on a branchA<\/ul>\n<\/li>\n<\/ul>\n
                                                                                               <\/p>\n
                                                                                                You want to apply that commit onto another branchB (with the same changes)<\/ul>\n
                                                                                                \u4f60\u53ef\u4ee5\u4ece\u5206\u652fA\u9009\u62e9\u6027\u5730\u6311\u9009\u51fa\u63d0\u4ea4A\uff0c\u5e76\u5c06\u5176\u5408\u5e76\u5230\u5206\u652fB\u4e0a\u3002<\/p>\n
                                                                                                git checkout branchB\r\ngit cherry-pick commit_number_of_commitA\r\n<\/code><\/pre>\n","protected":false},"excerpt":{"rendered":"
                                                                                                \u914d\u7f6egit \u4e00\u4e9b Git \u57fa\u672c\u914d\u7f6e git config –global user.name “Nguyen […]<\/p>\n","protected":false},"author":4,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-37481","post","type-post","status-publish","format-standard","hentry","category-uncategorized"],"yoast_head":"\nGit\u7684\u57fa\u7840 - 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\/git\u7684\u57fa\u7840\/\" \/>\n<meta property=\"og:locale\" content=\"zh_CN\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"Git\u7684\u57fa\u7840\" \/>\n<meta property=\"og:description\" content=\"\u914d\u7f6egit \u4e00\u4e9b Git \u57fa\u672c\u914d\u7f6e git config --global user.name "Nguyen […]\" \/>\n<meta property=\"og:url\" content=\"https:\/\/www.silicloud.com\/zh\/blog\/git\u7684\u57fa\u7840\/\" \/>\n<meta property=\"og:site_name\" content=\"Blog - Silicon Cloud\" \/>\n<meta property=\"article:published_time\" content=\"2023-09-25T07:33:56+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2024-01-15T01:30:08+00:00\" \/>\n<meta name=\"author\" content=\"\u79d1, \u96c5\" \/>\n<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n<meta name=\"twitter:label1\" content=\"\u4f5c\u8005\" \/>\n\t<meta name=\"twitter:data1\" content=\"\u79d1, \u96c5\" \/>\n\t<meta name=\"twitter:label2\" content=\"\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4\" \/>\n\t<meta name=\"twitter:data2\" content=\"3 \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\/git%e7%9a%84%e5%9f%ba%e7%a1%80\/\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e5%9f%ba%e7%a1%80\/\",\"name\":\"Git\u7684\u57fa\u7840 - Blog - Silicon Cloud\",\"isPartOf\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\"},\"datePublished\":\"2023-09-25T07:33:56+00:00\",\"dateModified\":\"2024-01-15T01:30:08+00:00\",\"author\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/41e222757cdd2a3365361328bd79970a\"},\"breadcrumb\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e5%9f%ba%e7%a1%80\/#breadcrumb\"},\"inLanguage\":\"zh-Hans\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e5%9f%ba%e7%a1%80\/\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e5%9f%ba%e7%a1%80\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u9996\u9875\",\"item\":\"https:\/\/www.silicloud.com\/zh\/blog\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"Git\u7684\u57fa\u7840\"}]},{\"@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\/41e222757cdd2a3365361328bd79970a\",\"name\":\"\u79d1, \u96c5\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/\",\"url\":\"https:\/\/secure.gravatar.com\/avatar\/1b2d3e00a7df03689797ebd4af8c5827ba5af936849a71050ec331f4cf902c5d?s=96&d=mm&r=g\",\"contentUrl\":\"https:\/\/secure.gravatar.com\/avatar\/1b2d3e00a7df03689797ebd4af8c5827ba5af936849a71050ec331f4cf902c5d?s=96&d=mm&r=g\",\"caption\":\"\u79d1, \u96c5\"},\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/author\/keya\/\"},{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e5%9f%ba%e7%a1%80\/#local-main-organization-logo\",\"url\":\"\",\"contentUrl\":\"\",\"caption\":\"Blog - Silicon Cloud\"}]}<\/script>\n<!-- \/ Yoast SEO Premium plugin. -->","yoast_head_json":{"title":"Git\u7684\u57fa\u7840 - 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\/git\u7684\u57fa\u7840\/","og_locale":"zh_CN","og_type":"article","og_title":"Git\u7684\u57fa\u7840","og_description":"\u914d\u7f6egit \u4e00\u4e9b Git \u57fa\u672c\u914d\u7f6e git config --global user.name \"Nguyen […]","og_url":"https:\/\/www.silicloud.com\/zh\/blog\/git\u7684\u57fa\u7840\/","og_site_name":"Blog - Silicon Cloud","article_published_time":"2023-09-25T07:33:56+00:00","article_modified_time":"2024-01-15T01:30:08+00:00","author":"\u79d1, \u96c5","twitter_card":"summary_large_image","twitter_misc":{"\u4f5c\u8005":"\u79d1, \u96c5","\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4":"3 \u5206"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"WebPage","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e5%9f%ba%e7%a1%80\/","url":"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e5%9f%ba%e7%a1%80\/","name":"Git\u7684\u57fa\u7840 - Blog - Silicon Cloud","isPartOf":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website"},"datePublished":"2023-09-25T07:33:56+00:00","dateModified":"2024-01-15T01:30:08+00:00","author":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/41e222757cdd2a3365361328bd79970a"},"breadcrumb":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e5%9f%ba%e7%a1%80\/#breadcrumb"},"inLanguage":"zh-Hans","potentialAction":[{"@type":"ReadAction","target":["https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e5%9f%ba%e7%a1%80\/"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e5%9f%ba%e7%a1%80\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u9996\u9875","item":"https:\/\/www.silicloud.com\/zh\/blog\/"},{"@type":"ListItem","position":2,"name":"Git\u7684\u57fa\u7840"}]},{"@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\/41e222757cdd2a3365361328bd79970a","name":"\u79d1, \u96c5","image":{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/","url":"https:\/\/secure.gravatar.com\/avatar\/1b2d3e00a7df03689797ebd4af8c5827ba5af936849a71050ec331f4cf902c5d?s=96&d=mm&r=g","contentUrl":"https:\/\/secure.gravatar.com\/avatar\/1b2d3e00a7df03689797ebd4af8c5827ba5af936849a71050ec331f4cf902c5d?s=96&d=mm&r=g","caption":"\u79d1, \u96c5"},"url":"https:\/\/www.silicloud.com\/zh\/blog\/author\/keya\/"},{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e5%9f%ba%e7%a1%80\/#local-main-organization-logo","url":"","contentUrl":"","caption":"Blog - Silicon Cloud"}]}},"_links":{"self":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37481","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\/4"}],"replies":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/comments?post=37481"}],"version-history":[{"count":2,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37481\/revisions"}],"predecessor-version":[{"id":58219,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37481\/revisions\/58219"}],"wp:attachment":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/media?parent=37481"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/categories?post=37481"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/tags?post=37481"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}