{"id":235,"date":"2021-11-21T13:56:41","date_gmt":"2021-11-21T13:56:41","guid":{"rendered":"http:\/\/47.103.123.166\/?p=235"},"modified":"2021-11-21T13:56:41","modified_gmt":"2021-11-21T13:56:41","slug":"%e5%a5%87%e6%80%aa%e7%9a%84%e7%9f%a5%e8%af%86%e5%8f%88%e5%a2%9e%e5%8a%a0%e4%ba%863-git","status":"publish","type":"post","link":"http:\/\/47.103.123.166\/?p=235","title":{"rendered":"\u5947\u602a\u7684\u77e5\u8bc6\u53c8\u589e\u52a0\u4e863\u2014\u2014git"},"content":{"rendered":"

Git\u7b80\u4ecb<\/h3>\n

\u5f00\u6e90\u7684\u5206\u5e03\u5f0f\u7248\u672c\u63a7\u5236\u7cfb\u7edf<\/p>\n

# \u5b89\u88c5\n    sudo apt install git<\/code><\/pre>\n
\u5e38\u7528\u7684\u57fa\u672c\u64cd\u4f5c<\/h3>\n
# \u4e0b\u8f7d\u8fdc\u7a0b\u5e93\u4ee3\u7801\n    git clone <\u7f51\u5740>              # \u5f53http\u8fde\u4e0d\u4e0a\u65f6\uff0c\u628ahttp\u6539\u6210git\n    git clone -b <\u5206\u652f\u540d> <\u7f51\u5740>\n\n# \u5207\u6362\u5206\u652f\u4e0e\u65b0\u5efa\u5206\u652f\n    git branch -av                      # \u67e5\u770b\u6240\u6709\u5206\u652f\n    # \u9009\u9879\n    # -a, --all             list both remote-tracking and local branches\n    # -v, --verbose         show hash and subject, give twice for upstream branch\n\n    git branch branchName               # \u521b\u5efa\u5206\u652f\n    git checkout branchName             # \u5207\u6362\u5206\u652f\n    git checkout -b branchName          # \u521b\u5efa\u5e76\u5207\u6362\u5230\u5206\u652f\uff0c\u7b49\u540c\u4e8e\u4e0a\u9762\u4e24\u6761\n\n# \u6dfb\u52a0\u65b0\u6587\u4ef6\u5230\u5de5\u7a0b\n    git add <file1> <file2>             # \u53ef\u6dfb\u52a0\u4e00\u4e2a\u6216\u591a\u4e2a\u6587\u4ef6\u5230\n\n# \u67e5\u770b\u662f\u5426\u6709\u672a\u63d0\u4ea4\u7684\u4fee\u6539\uff08\u5305\u62ec\u65b0\u5efa\u6587\u4ef6\u548c\u4fee\u6539\u6587\u4ef6\uff09\n    $ git status\n\n# \u67e5\u770b\u5177\u4f53\u7684\u4fee\u6539\u5185\u5bb9\uff0c\u5220\u9664\u7684\u5185\u5bb9\u4e3a\u7ea2\u8272\u51cf\u53f7,\u589e\u52a0\u7684\u5185\u5bb9\u4e3a\u7eff\u8272\u52a0\u53f7   \u4ee5\u884c\u4e3a\u5355\u4f4d\uff0c\u63d0\u793a\n    git diff            # \u6240\u6709\u4fee\u6539\n    git diff <file1>\n\n# \u63d0\u4ea4\u4fee\u6539\n    git commit <file1> <file2> -m \"message\"     # \u63d0\u4ea4\u4e00\u4e2a\u6216\u591a\u4e2a\u6587\u4ef6\u7684\u4fee\u6539  -m \u6ce8\u91ca\u63d0\u4ea4\u7684\u539f\u56e0\n    git commit -a -m \"message\"                  # \u63d0\u4ea4\u6240\u6709\u4fee\u6539\n\n# \u67e5\u770b\u63d0\u4ea4\u65e5\u5fd7\n    git log \n    git log --pretty=oneline                    # \u6bcf\u6761commit\u7528\u4e00\u884c\u663e\u793a \u5206\u5e03\u5f0f\u63a7\u5236\uff0c\u907f\u514d\u7248\u672c\u51b2\u7a81\uff0c\u56e0\u6b64commitID\u4e0d\u662f1234\n    git reflog                                  # \u8bb0\u5f55\u6bcf\u4e00\u6b21\u7684\u547d\u4ee4\uff0c\u53ef\u4ee5\u67e5\u770b\u5e72\u6389\u7684\u65e5\u5fd7\uff0c\u67e5\u770b\u5386\u53f2\u7248\u672c\u53f7\/\u547d\u4ee4\n\n# \u56de\u9000\n    # \u65b9\u5f0f\u4e00\uff1areset \n        git reset --hard HEAD^                  # \u56de\u9000\uff1aHEAD\u8868\u793a\u5f53\u524d\u7248\u672c \u4e00\u4e2a^\u8868\u793a\u4e0a\u4e00\u4e2a\uff0c\u4e24\u4e2a^\u8868\u793a\u4e0a\u4e0a\u4e2a\uff0cHEAD~100\u8868\u793a\u4e0a100\u4e2a\n        git reset --hard <\u521a\u5e72\u6389\u7684\u7248\u672c\u53f7>          # \u56de\u9000\u5230\u6307\u5b9a\u7248\u672c\u53f7\uff0c\u6bd4\u5982\u9519\u8bef\u56de\u9000\u540e\uff0c\u53ef\u4ee5\u6839\u636e\u7248\u672c\u53f7\u518d\u8fd8\u539f\u56de\u53bb\n    # \u65b9\u5f0f\u4e8c\uff1arevert\n        git revert -n <\u7248\u672c\u53f7>\n\n# \u4e0a\u4f20\u8fdc\u7a0b\u4e0e\u66f4\u65b0\u672c\u5730\n    git push [\u9009\u9879] origin <\u5206\u652f\u540d>              # \u5c06<\u5206\u652f\u540d>\u63a8\u9001\u5230origin\u4e3b\u673a\u7684\u5bf9\u5e94\u5206\u652f\n    # \u9009\u9879\n    # -f    \u5f3a\u63a8\n    # -u    \u5982\u679c\u5f53\u524d\u5206\u652f\u4e0e\u591a\u4e2a\u4e3b\u673a\u5b58\u5728\u8ffd\u8e2a\u5173\u7cfb\uff0c\u90a3\u4e48\u8fd9\u4e2a\u65f6\u5019-u\u9009\u9879\u4f1a\u6307\u5b9a\u4e00\u4e2a\u9ed8\u8ba4\u4e3b\u673a\uff0c\u8fd9\u6837\u540e\u9762\u5c31\u53ef\u4ee5\u4e0d\u52a0\u4efb\u4f55\u53c2\u6570\u4f7f\u7528git push\n\n    # \u62c9\u53d6\n    git fetch <\u8fdc\u7a0b\u4e3b\u673a\u540d\uff0c\u5982origin> <\u5206\u652f\u540d>         # \u62c9\u53d6\n    git pull <\u8fdc\u7a0b\u4e3b\u673a\u540d\uff0c\u5982origin> <\u5206\u652f\u540d>      # \u62c9\u53d6\u5e76merge\n\n# \u5408\u5e76\u5206\u652f\n    git merge <\u8981\u5408\u5e76\u5230\u672c\u5206\u652f\u7684\u5206\u652f\u540d> \n\n# \u6062\u590d\u8bef\u5220\u5206\u652f\n    git branch <\u5206\u652f\u540d> <hash_val><\/code><\/pre>\n
\u521b\u5efa\u4e0e\u914d\u7f6e\u672c\u5730\u4ed3\u5e93<\/h3>\n
# \u521b\u5efa\u4ed3\u5e93\u76ee\u5f55\n    $ mkdir repo_test1 && cd repo_test1\n\n# \u521d\u59cb\u5316\n    $ git init \n        # \u8fd9\u65f6\uff0c\u4f1a\u5728\u8be5\u76ee\u5f55\u4e0b\u521b\u5efa\u4e00\u4e2a .git \u76ee\u5f55\u7528\u4e8e\u8ddf\u8e2a\u7ba1\u7406\u7248\u672c\u5e93\uff0c\u5e76\u63d0\u793a\n        Initialized empty Git repository in [\u81ea\u5df1\u7684\u76ee\u5f55]\/git_test\/repo_test1\/.git\/\n\n# \u914d\u7f6e\u4ed3\u5e93\u6240\u6709\u8005\u4fe1\u606f\n    # Omit --global to set the identity only in this repository.\n    $ git config --global user.email \"you@example.com\"\n    $ git config --global user.name \"Your Name\"<\/code><\/pre>\n
\u5173\u8054\u672c\u5730\u4e0e\u8fdc\u7a0b\u4ed3\u5e93<\/h3>\n
\u5148\u6709\u8fdc\u7a0b\u4ed3\u5e93<\/p>\n
    \n
  1. \u5efa\u7acb\u8fdc\u7a0b\u4ed3\u5e93<\/li>\n
  2. git clone \u5230\u672c\u5730\u4ed3\u5e93<\/li>\n<\/ol>\n
    \u5148\u6709\u672c\u5730\u4ed3\u5e93
    \n\uff08 \u5f85\u8865\u5145… \uff09
    \n\u5173\u8054\u672c\u5730\u4ed3\u5e93\u4e0e\u8fdc\u7a0b\u4ed3\u5e93<\/a><\/p>\n
    \u5173\u4e8e\u56de\u9000<\/h3>\n
      \n
    1. \u56de\u9000\u65b9\u5f0f\u4e00\uff1agit reset\uff0c\u9002\u7528\u573a\u666f\uff1a\u6700\u8fd1\u51e0\u4e2a\u9519\u8bef\u7248\u672c\u5168\u90e8\u820d\u5f03
      \n\"\u5728\u8fd9\u91cc\u63d2\u5165\u56fe\u7247\u63cf\u8ff0\"<\/li>\n
    2. \u56de\u9000\u65b9\u5f0f\u4e8c \uff1agit revert\uff0c\u9002\u7528\u573a\u666f\uff1a\u56de\u9000\u4e2d\u95f4\u67d0\u4e2a\u7248\u672c\uff0c\u4fdd\u7559\u6700\u8fd1\u7248\u672c
      \n\"\u5728\u8fd9\u91cc\u63d2\u5165\u56fe\u7247\u63cf\u8ff0\"
      \n\uff01\uff01\uff01 git reset –hard \u64a4\u9500\u5230\u67d0\u6b21\u63d0\u4ea4\uff0cgit revert \u64a4\u9500\u67d0\u6b21\u63d0\u4ea4\uff0c\u4e00\u822c\u5efa\u8bae\u7528revert<\/strong><\/li>\n<\/ol>\n
      # \u67e5\u770b\u63d0\u4ea4\u65e5\u5fd7\n    git log --pretty=oneline\n\n# \u56de\u9000\u65b9\u5f0f\u4e00 git reset   \n    $ git reset --hard <\u7248\u672c\u53f7>\n# \u63a8\u4e0a\u53bb\uff0c\u4f7f\u7528reset\u65f6\uff0c\u5982\u679c\u7528\u4e0d\u52a0\u9009\u9879\u201c-f\u201d\u4f1a\u62a5\u9519\uff0c\u56e0\u4e3a\u672c\u5730\u5e93HEAD\u6307\u5411\u7684\u7248\u672c\u6bd4\u8fdc\u7a0b\u5e93\u7684\u8981\u65e7\n    $ git push -f origin <\u5206\u652f\u540d> \n\n# \u56de\u9000\u65b9\u5f0f\u4e8c git revert\n    $ git revert -n <\u7248\u672c\u53f7>\n# \u63a8\u4e0a\u53bb\n    $ git push origin <\u5206\u652f\u540d> \n\n# \u66f4\u65b0\u672c\u5730\n    $ git pull<\/code><\/pre>\n
      \u4fee\u6539\u5386\u53f2commit<\/h3>\n
      https:\/\/blog.csdn.net\/lxf0613050210\/article\/details\/52525083<\/a><\/a>   \u6bcf\u4e00\u4e2acommit\u90fd\u8981\u5355\u72ec\u4fee\u6539\u3002\u8feb\u4e0d\u5f97\u5df2\u4e0d\u8981\u4fee\u6539\uff0c\u9700\u8981\u5f3a\u5236commit<\/p>\n
      \u6458\u6284<\/h3>\n
      master & origin\/master<\/h4>\n
      \n
      \u5728 clone \u5b8c\u6210\u4e4b\u540e\uff0cGit \u4f1a\u81ea\u52a8\u4e3a\u4f60\u5c06\u6b64\u8fdc\u7a0b\u4ed3\u5e93\u547d\u540d\u4e3a origin\uff08origin \u53ea\u76f8\u5f53\u4e8e\u4e00\u4e2a\u522b\u540d\uff0c\u8fd0\u884c git remote \u2013v \u6216\u8005\u67e5\u770b .git\/config \u53ef\u4ee5\u770b\u5230 origin \u7684\u542b\u4e49\uff09\uff0c\u5e76\u4e0b\u8f7d\u5176\u4e2d\u6240\u6709\u7684\u6570\u636e\uff0c\u5efa\u7acb\u4e00\u4e2a\u6307\u5411\u5b83\u7684 master \u5206\u652f\u7684\u6307\u9488\uff0c\u6211\u4eec\u7528 (\u8fdc\u7a0b\u4ed3\u5e93\u540d)\/(\u5206\u652f\u540d) \u8fd9\u6837\u7684\u5f62\u5f0f\u8868\u793a\u8fdc\u7a0b\u5206\u652f\uff0c\u6240\u4ee5 origin\/master \u6307\u5411\u7684\u662f\u4e00\u4e2a remote branch\uff08\u4ece\u90a3\u4e2a branch \u6211\u4eec clone \u6570\u636e\u5230\u672c\u5730\uff09\uff0c\u4f46\u4f60\u65e0\u6cd5\u5728\u672c\u5730\u66f4\u6539\u5176\u6570\u636e\u3002
      \n\u540c\u65f6\uff0cGit \u4f1a\u5efa\u7acb\u4e00\u4e2a\u5c5e\u4e8e\u4f60\u81ea\u5df1\u7684\u672c\u5730 master \u5206\u652f\uff0c\u5b83\u6307\u5411\u7684\u662f\u4f60\u521a\u521a\u4ece remote server \u4f20\u5230\u4f60\u672c\u5730\u7684\u526f\u672c\u3002\u968f\u7740\u4f60\u4e0d\u65ad\u7684\u6539\u52a8\u6587\u4ef6\uff0cgit add , git commit\uff0cmaster \u7684\u6307\u5411\u4f1a\u81ea\u52a8\u79fb\u52a8\uff0c\u4f60\u4e5f\u53ef\u4ee5\u901a\u8fc7merge\uff08fast forward\uff09\u6765\u79fb\u52a8 master \u7684\u6307\u5411\u3002
      \n\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014
      \n\u539f\u6587\u94fe\u63a5\uff1a      https:\/\/blog.csdn.net\/weixin_34075268\/article\/details\/85869357<\/a><\/p>\n<\/blockquote>\n
      pull & clone & fetch<\/h4>\n
      \n
      \u4ece\u8fdc\u7a0b\u670d\u52a1\u5668\u514b\u9686\u4e00\u4e2a\u4e00\u6a21\u4e00\u6837\u7684\u7248\u672c\u5e93\u5230\u672c\u5730,\u590d\u5236\u7684\u662f\u6574\u4e2a\u7248\u672c\u5e93\uff0c\u53eb\u505aclone.\uff08clone\u662f\u5c06\u4e00\u4e2a\u5e93\u590d\u5236\u5230\u4f60\u7684\u672c\u5730\uff0c\u662f\u4e00\u4e2a\u672c\u5730\u4ece\u65e0\u5230\u6709\u7684\u8fc7\u7a0b\uff09
      \n\u4ece\u8fdc\u7a0b\u670d\u52a1\u5668\u83b7\u53d6\u5230\u4e00\u4e2abranch\u5206\u652f\u7684\u66f4\u65b0\u5230\u672c\u5730\uff0c\u5e76\u66f4\u65b0\u672c\u5730\u5e93\uff0c\u53eb\u505apull.\uff08pull\u662f\u6307\u540c\u6b65\u4e00\u4e2a\u5728\u4f60\u672c\u5730\u6709\u7248\u672c\u7684\u5e93\u5185\u5bb9\u66f4\u65b0\u7684\u90e8\u5206\u5230\u4f60\u7684\u672c\u5730\u5e93\uff09
      \ngit pull\u76f8\u5f53\u4e8e\u662f\u4ece\u8fdc\u7a0b\u83b7\u53d6\u6700\u65b0\u7248\u672c\u5e76merge\uff08\u5408\u5e76\uff09\u5230\u672c\u5730     git pull = git fetch + git merge\uff0cgit fetch\u66f4\u5b89\u5168\u4e00\u4e9b
      \n\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014
      \n\u7248\u6743\u58f0\u660e\uff1a\u672c\u6587\u4e3aCSDN\u535a\u4e3b\u300czhou_xiaomiao\u300d\u7684\u539f\u521b\u6587\u7ae0\uff0c\u9075\u5faaCC 4.0 BY-SA\u7248\u6743\u534f\u8bae\uff0c\u8f6c\u8f7d\u8bf7\u9644\u4e0a\u539f\u6587\u51fa\u5904\u94fe\u63a5\u53ca\u672c\u58f0\u660e\u3002
      \n\u539f\u6587\u94fe\u63a5\uff1a      https:\/\/blog.csdn.net\/zhou_xiaomiao\/article\/details\/53185712<\/a><\/p>\n
      git fetch \u5c06\u8fdc\u7a0b\u4e3b\u673a\u7684\u6700\u65b0\u5185\u5bb9\u62c9\u5230\u672c\u5730\uff0c\u7528\u6237\u5728\u68c0\u67e5\u4e86\u4ee5\u540e\u51b3\u5b9a\u662f\u5426\u5408\u5e76\u5230\u5de5\u4f5c\u672c\u673a\u5206\u652f\u4e2d\u3002
      \ngit pull \u5c06\u8fdc\u7a0b\u4e3b\u673a\u7684\u6700\u65b0\u5185\u5bb9\u62c9\u4e0b\u6765\u540e\u76f4\u63a5\u5408\u5e76\uff0c\u5373\uff1agit pull = git fetch + git merge\uff0c\u8fd9\u6837\u53ef\u80fd\u4f1a\u4ea7\u751f\u51b2\u7a81\uff0c\u9700\u8981\u624b\u52a8\u89e3\u51b3\u3002<\/p>\n<\/blockquote>\n
      \u53c2\u8003<\/h3>\n
        \n
      1. https:\/\/blog.csdn.net\/lvsehaiyang1993\/article\/details\/80821976<\/a><\/a><\/li>\n
      2. GitHub\u8fdb\u884c\u7248\u672c\u56de\u9000<\/a><\/li>\n
      3. git checkout \u547d\u4ee4\u8be6\u89e3<\/a><\/li>\n
      4. Git\u6062\u590d\u4e4b\u524d\u7248\u672c\u7684\u4e24\u79cd\u65b9\u6cd5reset\u3001revert\uff08\u56fe\u6587\u8be6\u89e3\uff09<\/a><\/li>\n
      5. git clone\u3001git pull\u548cgit fetch\u7684\u7528\u6cd5\u53ca\u533a\u522b<\/a><\/li>\n<\/ol>\n","protected":false},"excerpt":{"rendered":"
        Git\u7b80\u4ecb \u5f00\u6e90\u7684\u5206\u5e03\u5f0f\u7248\u672c\u63a7\u5236\u7cfb\u7edf # \u5b89\u88c5 sudo apt install git \u5e38\u7528\u7684\u57fa\u672c\u64cd\u4f5c # \u4e0b\u8f7d\u8fdc\u7a0b\u5e93\u4ee3\u7801 git clone <\u7f51\u5740> # \u5f53http\u8fde\u4e0d\u4e0a\u65f6\uff0c\u628ahttp\u6539\u6210git git clone -b <\u5206\u652f\u540d> <\u7f51\u5740> # \u5207\u6362\u5206\u652f\u4e0e\u65b0\u5efa\u5206\u652f git branch -av # \u67e5\u770b\u6240\u6709\u5206\u652f # \u9009\u9879 # -a, –all list both remote-tracking and local branches # -v, –verbose show hash and subject, give twice for upstream branch git branch branchName # […]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":[],"categories":[7],"tags":[],"_links":{"self":[{"href":"http:\/\/47.103.123.166\/index.php?rest_route=\/wp\/v2\/posts\/235"}],"collection":[{"href":"http:\/\/47.103.123.166\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"http:\/\/47.103.123.166\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"http:\/\/47.103.123.166\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"http:\/\/47.103.123.166\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=235"}],"version-history":[{"count":1,"href":"http:\/\/47.103.123.166\/index.php?rest_route=\/wp\/v2\/posts\/235\/revisions"}],"predecessor-version":[{"id":236,"href":"http:\/\/47.103.123.166\/index.php?rest_route=\/wp\/v2\/posts\/235\/revisions\/236"}],"wp:attachment":[{"href":"http:\/\/47.103.123.166\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=235"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/47.103.123.166\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=235"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/47.103.123.166\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=235"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}