{"id":1454,"date":"2010-09-26T17:13:38","date_gmt":"2010-09-26T09:13:38","guid":{"rendered":"http:\/\/edsionte.com\/techblog\/?p=1454"},"modified":"2010-09-27T19:47:04","modified_gmt":"2010-09-27T11:47:04","slug":"git%e5%bf%ab%e9%80%9f%e5%85%a5%e9%97%a8qa","status":"publish","type":"post","link":"http:\/\/edsionte.com\/techblog\/archives\/1454","title":{"rendered":"Git\u5feb\u901f\u5165\u95e8(Q&A)"},"content":{"rendered":"

\u5982\u679c\u4f60\u5bf9\u4e8egit\u5b8c\u5168\u4e0d\u77e5\uff0c\u90a3\u4e48\u4e0d\u7528\u7740\u6025\uff0c\u6211\u4eec\u4e00\u8d77\u6765\u4ece\u96f6\u5f00\u59cb\u5b66\u4e60\u3002<\/p>\n

1.\u96be\u9053git\u5c31\u662f\u50bb\u74dc\u7684\u610f\u601d\u5417\uff1f<\/p>\n

git\u662f\u4e00\u4e2a\u7248\u672c\u63a7\u5236\u7cfb\u7edf,\u4e5f\u53eb\u505a\u50bb\u74dc\u5185\u5bb9\u8ddf\u8e2a\u5668\u3002\u6309\u7167\u6211\u76ee\u524d\u7684\u7406\u89e3\u662f\uff1a\u4e00\u4e2a\u9879\u76ee\u56e2\u961f\u5171\u540c\u5b8c\u4e00\u4e2a\u9879\u76ee\uff0c\u800c\u4e14\u56e2\u961f\u91cc\u7684\u6bcf\u4e2a\u4eba\u90fd\u6df1\u5904\u5f02\u5730\uff0c\u90a3\u4e48\u5982\u4f55\u5c06\u6bcf\u4e2a\u4eba\u8d1f\u8d23\u7684\u4ee3\u7801\u878d\u5408\u5728\u4e00\u8d77\uff1f\u800c\u4e14\u5982\u4f55\u6e05\u6670\u7684\u5c55\u73b0\u4e0d\u540c\u7684\u4eba\u5728\u4e0d\u540c\u7684\u5730\u65b9\u5728\u4e0d\u540c\u7684\u65f6\u95f4\u91cc\u5bf9\u4ee3\u7801\u505a\u8fc7\u4fee\u6539\uff1f\u8fd9\u65f6\u5019\uff0cgit\u6d3e\u4e0a\u7528\u573a\u4e86\u3002<\/p>\n

\u4e8b\u5b9e\u4e0a\uff0cLinux\u5185\u6838\u6b63\u662f\u4f7f\u7528git\u8fdb\u884c\u7ba1\u7406\u7684\uff0c\u800cgit\u7684\u521b\u59cb\u4eba\u4e5f\u6b63\u662flinux\u4e4b\u7236\uff1aLinus Torvalds\u3002<\/p>\n

2.\u6211\u5982\u4f55\u624d\u80fd\u83b7\u5f97git\uff1f<\/p>\n

\u60f3\u4f7f\u7528git\uff0c\u80af\u5b9a\u5fc5\u987b\u5b89\u88c5git\u4e86\u3002\u5982\u679c\u4f60\u5728ubuntu\u4e0b\uff0c\u4f7f\u7528\u4e0b\u9762\u7684\u547d\u4ee4\u53ef\u4ee5\u5feb\u901f\u5b89\u88c5\uff1asudo apt-get install git-core\u3002\u5b89\u88c5\u5b8c\u6210\u540e\uff0c\u53ef\u4f7f\u7528git –version\u67e5\u770bgit\u7684\u7248\u672c\u53f7\u3002<\/p>\n

3.\u6211\u5728\u5b89\u88c5\u5b8cgit\u540e\u8be5\u505a\u4e9b\u4ec0\u4e48\uff1f<\/p>\n

\u9996\u5148\u4f60\u5f97\u5411git\u4ecb\u7ecd\u4f60\u81ea\u5df1\uff0c\u544a\u8bc9\u5b83\u4f60\u7684\u59d3\u540d\u548c\u90ae\u7bb1\u5427\u3002<\/p>\n

git config --global user.name \"edsionte\"\r\ngit config --global user.email \"edsionte@gmail.com\"<\/pre>\n
4.\u6211\u4f9d\u7136\u53ef\u4ee5\u901a\u8fc7\u7537\u4eba\u624b\u518c\u83b7\u5f97git\u7684\u5e2e\u52a9\u5417\uff1f<\/p>\n
\u5f53\u7136\u53ef\u4ee5\uff0c\u7537\u4eba\u624b\u518c\u662f\u5f3a\u5927\u7684\u3002\u6bd4\u5982\u6211\u4eec\u53ef\u4ee5\u901a\u8fc7\u4e0b\u9762\u7684\u547d\u4ee4\u83b7\u5f97git\u4e2dcommit\u547d\u4ee4\u7684\u76f8\u5173\u5e2e\u52a9\u3002<\/p>\n
man git-commit<\/pre>\n
5.\u6211\u5982\u4f55\u5f00\u542f\u4e00\u4e2a\u65b0\u7684\u7ba1\u7406\u9879\u76ee\uff1f<\/p>\n
\u6bd4\u5982\u4f60\u8981\u7ba1\u7406\u7684\u9879\u76ee\u76ee\u5f55\u4e3amywork\uff0c\u8be5\u76ee\u5f55\u4e0b\u6709\u4e00\u4e2a\u6587\u4ef6hello.c.\u8fdb\u5165\u5230\u8be5\u76ee\u5f55\uff0c\u901a\u8fc7git init\u547d\u4ee4\u5c31\u53ef\u4ee5\u521b\u5efa\u4e00\u4e2a\u7248\u672c\u5e93\u3002hello.c\u7684\u5185\u5bb9\u5982\u4e0b\uff1a<\/p>\n
edsionte@edsionte-desktop:~\/mywork$ cat hello.c\r\n#include \u201cstdio.h\u201d\r\n\r\nint main()\r\n{\r\n\tprintf(\"hello,git!\\n\");\r\n\tprintf(\"I can use git!\\n\");\r\n\treturn 0;\r\n}<\/pre>\n
6.\u5982\u4f55\u5c06\u6211\u7684\u6587\u4ef6\u52a0\u5165\u5230\u7248\u672c\u5e93\uff1f<\/p>\n
\u6bd4\u5982\u6211\u8981\u5c06hello.c\u6587\u4ef6\u52a0\u5165\u5230\u6211\u7684\u7248\u672c\u5e93\uff0c\u90a3\u4e48\u6211\u53ef\u4ee5\u8fd9\u6837\uff1a<\/p>\n
git add hello.c\r\ngit commit<\/pre>\n
\u7b2c\u4e00\u6761\u547d\u4ee4\u53ea\u662f\u5c06hello.c\u6587\u4ef6\u589e\u52a0\u5230\u7248\u672c\u5e93\u7684\u7d22\u5f15\u5f53\u4e2d\uff0c\u800c\u7b2c\u4e8c\u6761\u547d\u4ee4\u624d\u771f\u6b63\u7684\u5c06hello.c\u6587\u4ef6\u7684\u5185\u5bb9\u63d0\u4ea4\u5230\u7248\u672c\u5e93\u4e2d\uff0c\u5e76\u4e14\u5f53\u4f60\u6267\u884c\u7b2c\u4e8c\u6761\u547d\u4ee4\u7684\u65f6\u5019\u4f1a\u5728\u7ec8\u7aef\u51fa\u73b0\u65b0\u7684\u754c\u9762\uff0c\u5728\u8fd9\u4e2a\u754c\u9762\u4e2d\u4f60\u53ef\u4ee5\u8f93\u5165\u4e0e\u8be5\u6587\u4ef6\u76f8\u5173\u7684\u5f00\u53d1\u65e5\u5fd7\u7b49\uff0c\u6bd4\u5982\u6211\u4eec\u8f93\u5165\u201cThe version is: 0.0.1\u201d\u3002\u6ce8\u610f\uff0c\u8981\u5728\u8fd9\u4e2a\u754c\u9762\u4e0b\u8fdb\u884c\u76f8\u5173\u64cd\u4f5c\u5fc5\u987b\u4ee5ctrl\u7ec4\u5408\u76f8\u5e94\u7684\u5b57\u6bcd\u3002<\/p>\n
\u4e8b\u5b9e\u4e0a\u7b2c\u4e8c\u6761\u547d\u4ee4\u6211\u4eec\u53ef\u4ee5\u8fd9\u6837\u5904\u7406\uff1a<\/p>\n
git commit -m \"The version is: 0.0.1\"<\/pre>\n
\u5373\u76f4\u63a5\u5728\u547d\u4ee4\u4e2d\u8f93\u5165\u5f00\u53d1\u65e5\u5fd7\u4fe1\u606f\u3002<\/p>\n
\u6bcf\u5f53\u4f60\u6539\u8fdb\u539f\u6709\u6587\u4ef6\u7684\u4ee3\u7801\u65f6\uff0c\u4f60\u90fd\u53ef\u4ee5\u6309\u7167\u4e0a\u9762\u7684\u6307\u4ee4\u5c06\u66f4\u65b0\u540e\u7684\u5185\u5bb9\u6dfb\u52a0\u5230\u7248\u672c\u5e93\u4e2d\u3002\u4e0d\u8fc7\uff0c\u5f53\u6211\u4eec\u53ea\u662f\u66f4\u65b0\u4e86\u539f\u6709\u6587\u4ef6\u7684\u5185\u5bb9\u800c\u4e0d\u662f\u65b0\u589e\u6587\u4ef6\u6216\u8005\u76ee\u5f55\u65f6\uff0c\u5c31\u53ef\u4ee5\u7528\u4e0b\u9762\u7684\u547d\u4ee4\u4ee3\u66ff\u4ee5\u4e0a\u5de5\u4f5c\uff1a<\/p>\n
git commit -a<\/pre>\n
7.\u5728\u6211\u5bf9\u67d0\u4e2a\uff08\u4e9b\uff09\u6587\u4ef6\u8fdb\u884c\u4e86\u4fee\u6539\u4e4b\u540e\uff0c\u6211\u5982\u4f55\u67e5\u770b\u65b0\u65e7\u6587\u4ef6\u7684\u5dee\u5f02\uff1f<\/p>\n
\u8fd9\u662f\u4e00\u4e2a\u597d\u95ee\u9898\u3002\u4e0d\u8fc7\u5728\u56de\u7b54\u8fd9\u4e2a\u95ee\u9898\u4e4b\u524d\uff0c\u8bf7\u5148\u56de\u987e\u5982\u4f55\u5c06\u4e00\u4e2a\u6587\u4ef6\u66f4\u65b0\u5230\u7248\u672c\u5e93\uff1a\u5148\u4fee\u6539\u6587\u4ef6\uff0c\u518dadd\uff0c\u518dcommit\u3002OK\uff0c\u90a3\u4e48\u63a5\u4e0b\u6765\u7684\u51e0\u4e2a\u6307\u4ee4\u7684\u4f7f\u7528\u65f6\u95f4\u5c31\u5f88\u6e05\u6670\u4e86\u3002<\/p>\n
\u5728add\u4e4b\u524d\uff0c\u53ef\u4ee5\u4f7f\u7528git diff\u547d\u4ee4\u6765\u67e5\u770b\u6587\u4ef6\u88ab\u66f4\u65b0\u524d\u540e\u7684\u5dee\u5f02\u3002<\/p>\n
\u5728coomit\u4e4b\u524d\uff0c\u53ef\u4ee5\u4f7f\u7528git diff –cached\u547d\u4ee4\u6765\u67e5\u770b\u6587\u4ef6\u88ab\u66f4\u65b0\u524d\u540e\u7684\u5dee\u5f02\u3002<\/p>\n
\u4ee5\u4e0a\u547d\u4ee4\u53ef\u4ee5\u67e5\u770b\u6587\u4ef6\u5185\u5bb9\u7684\u5177\u4f53\u5dee\u5f02\u3002\u90a3\u4e48\u5728coomit\u4e4b\u524d\uff0c\u5982\u4f55\u67e5\u770b\u90a3\u4e9b\u6587\u4ef6\u88ab\u4fee\u6539\u8fc7\uff1fgit status\u5373\u53ef\u505a\u5230\u3002<\/p>\n
8.\u65e2\u7136\u6211\u8bb0\u5f55\u4e86\u5f00\u53d1\u65e5\u5fd7\uff0c\u90a3\u4e48\u6211\u5982\u4f55\u67e5\u770b\u5b83\uff1f<\/p>\n
git log<\/pre>\n
9.\u4ec0\u4e48\u662f\u5206\u652f\uff1f\u5206\u652f\u6709\u4f55\u7528\uff1f<\/p>\n
\u4ee5\u4e0a\u6211\u4eec\u7684\u64cd\u4f5c\u5747\u662f\u5728\u4e3b\u5206\u652fmaster\u4e2d\u8fdb\u884c\u7684\u3002\u6709\u65f6\u5019\u6211\u4eec\u9700\u8981\u521b\u5efa\u4e00\u4e2a\u4e2a\u4eba\u5206\u652f\uff0c\u4ee5\u907f\u514d\u5bf9\u4e3b\u5206\u652f\u7684\u5f71\u54cd\uff1b\u6709\u65f6\u5019\u6211\u4eec\u9700\u8981\u4e00\u4e2a\u4e34\u65f6\u6027\u7684\u5206\u652f\u53bb\u5b8c\u6210\u4e00\u4e9b\u5b9e\u9a8c\u6027\u7684\u5de5\u4f5c\uff1b\u5f53\u51fa\u73b0\u4ee5\u4e0a\u60c5\u51b5\u65f6\uff0c\u6211\u4eec\u5c31\u9700\u8981\u521b\u5efa\u4e00\u4e2a\u5206\u652f\u3002<\/p>\n
10.\u5982\u4f55\u521b\u5efa\u4e00\u4e2a\u5206\u652f\uff1f\u5bf9\u4e8e\u8fd9\u4e2a\u5206\u652f\u6211\u80fd\u505a\u4e9b\u4ec0\u4e48\uff1f<\/p>\n
\u5982\u679c\u6211\u60f3\u521b\u5efatemp\u5206\u652f\uff0c\u90a3\u4e48\u53ef\u4ee5\u901a\u8fc7git branch temp\u6765\u5b8c\u6210\u3002 \u901a\u8fc7git branch\u547d\u4ee4\u53ef\u4ee5\u67e5\u770b\u6240\u4ee5\u5206\u652f\uff0c\u6bd4\u5982\uff1a<\/p>\n
edsionte@edsionte-desktop:~\/mywork$ git branch\r\n* master\r\n  slave\r\n  temp<\/pre>\n
\u800c\u4e14*\u6807\u5fd7\u8868\u793a\u5f53\u524d\u4f60\u6240\u5728\u7684\u5206\u652f\u3002\u5982\u679c\u4f60\u60f3\u8fdb\u5165temp\u5206\u652f\uff0c\u90a3\u4e48\u901a\u8fc7git checkout temp\u547d\u4ee4\u5b8c\u6210\u3002\u63a5\u4e0b\u6765\u4f60\u518dtemp\u5206\u652f\u4e2d\u521b\u5efa\u65b0\u6587\u4ef6\u6216\u8005\u4fee\u6539\u539f\u6709\u6587\u4ef6\u90fd\u4e0d\u4f1a\u5f71\u54cd\u4e3b\u5206\u652f\u3002<\/p>\n
11.\u5230\u76ee\u524d\u4e3a\u6b62\uff0c\u6211\u8ba4\u4e3atemp\u5206\u652f\u5b8c\u5168\u6b63\u786e\uff0c\u90a3\u4e48\u5982\u4f55\u5c06\u5b83\u5408\u5e76\u5230\u4e3b\u5206\u652f\uff1f<\/p>\n
\u5728\u8fd9\u4e4b\u524d\u4f60\u8981\u786e\u8ba4\u4e00\u4e0btemp\u5206\u652f\u548cmaster\u5206\u652f\u4e2d\u73b0\u5728\u5b58\u5728\u90a3\u4e9b\u6587\u4ef6\u3002\u5728master\u5206\u652f\u4e2d\u6709\u4e00\u4e2ahello.c\u6587\u4ef6\u3002\u5728temp\u5206\u652f\u4e2d\u5f53\u7136\u4e5f\u5b58\u5728hello.c\u6587\u4ef6\uff0c\u4e0d\u8fc7\u88ab\u4fee\u6539\u6210\u5982\u4e0b\u5185\u5bb9\uff1a<\/p>\n
edsionte@edsionte-desktop:~\/mywork$ cat hello.c\r\n#include \u201cstdio.h\u201d\r\n\r\nint main()\r\n{\r\n\tprintf(\"hello,git!\\n\");\r\n\tprintf(\"I can use git!\\n\");\r\n\tprintf(\"I love git!\\n\");\r\n\treturn 0;\r\n}<\/pre>\n
\u6b64\u5916\uff0c\u5728temp\u5206\u652f\u4e2d\u8fd8\u65b0\u5efa\u4e86hi.c\u6587\u4ef6\u3002\u4f7f\u7528git commit -a\u547d\u4ee4\u5411\u7248\u672c\u5e93\u4e2d\u63d0\u4ea4\u4e86hello.c\u6587\u4ef6\u540e\uff0c\u8fd8\u5fc5\u987badd\u548ccommit\u6765\u63d0\u4ea4\u65b0\u5efa\u7684hi.c\u6587\u4ef6\uff0c\u5b8c\u6210\u540e\u5207\u6362\u5230master\u5206\u652f\u3002\u63a5\u7740\u4f7f\u7528git merge temp\u547d\u4ee4\u5c31\u53ef\u5c06temp\u5206\u652f\u5408\u5e76\u5230\u4e3b\u5206\u652f\u4e86\u3002\u67e5\u770bhello.c\u6587\u4ef6\uff0c\u662f\u4e0d\u662f\u5df2\u7ecf\u66f4\u65b0\u4e86\uff1f\u800c\u4e14\u8fd8\u65b0\u589e\u4e86hi.c\u6587\u4ef6\u3002<\/p>\n
edsionte@edsionte-desktop:~\/mywork$ git merge temp\r\nMerge made by recursive.\r\n hello.c |    1 +\r\n 1 files changed, 1 insertions(+), 0 deletions(-)<\/pre>\n
12.\u867d\u7136\u4f60\u8bf4\u7684\u5f88\u8f7b\u677e\uff0c\u53ef\u662f\u6211\u5728\u8bd5\u9a8c\u7684\u65f6\u5019\u8fd8\u662f\u51fa\u73b0\u4e86\u8bf8\u5982\u4e0b\u9762\u7684\u9519\u8bef\uff0c\u8fd9\u662f\u600e\u4e48\u56de\u4e8b\uff1f<\/p>\n
edsionte@edsionte-desktop:~\/mywork$ git merge temp\r\nAuto-merging hello.c\r\nCONFLICT (content): Merge conflict in hello.c\r\nAutomatic merge failed; fix conflicts and then commit the result.<\/pre>\n
\u5982\u679c\u51fa\u73b0\u8fd9\u6837\u7684\u60c5\u51b5\uff0c\u6211\u4eec\u53ef\u4ee5\u770b\u4e00\u4e0bmaster\u5206\u652f\u4e0b\u7684hello.c\u6587\u4ef6\uff1a<\/p>\n
edsionte@edsionte-desktop:~\/mywork$ cat hello.c\r\n#include \u201cstdio.h\u201d\r\n\r\nint main()\r\n{\r\n\tprintf(\"hello,git!\\n\");\r\n<<<<<<< HEAD ======= \tprintf(\"I can use git!\\n\"); >>>>>>> temp\r\n\treturn 0;\r\n}<\/pre>\n
“====”\u7b26\u53f7\u662f\u51fa\u73b0\u6df7\u6dc6\u5185\u5bb9\u7684\u5206\u5272\u7ebf\u3002\u201c<<<<<<< HEAD\u201d\u4e0e”====”\u4e4b\u95f4\u7684\u8bed\u53e5\u6bb5\u4e3a\u7a7a\uff0c\u800c”====”\u4e0e\u201c>>>>>>> temp\u201d\u4e4b\u95f4\u7684\u8bed\u53e5\u6bb5\u4e3aprintf(“I can use git!\\n”);\u3002\u51fa\u73b0\u8fd9\u79cd\u60c5\u51b5\u662f\u56e0\u4e3agit\u4e0d\u80fd\u8fa8\u522b\u8fd9\u4e24\u6bb5\u8bed\u53e5\u7684\u524d\u540e\u5173\u7cfb\uff0c\u8fd9\u65f6\u5019\u9700\u8981\u6211\u4eec\u4eba\u4e3a\u6765\u8c03\u6574\u5206\u652f\u6587\u4ef6\u7684\u5185\u5bb9\u518d\u5408\u5e76\u3002<\/p>\n
13.\u63a5\u4e0b\u6765\u6211\u8fd8\u80fd\u505a\u4e9b\u4ec0\u4e48\uff1f<\/p>\n
\u4ee5\u4e0a\u7684\u5185\u5bb9\u53ea\u662fgit\u7684\u7b80\u5355\u5165\u95e8\u6559\u7a0b\uff0c\u66f4\u591a\u7684\u5185\u5bb9\u53ef\u4ee5\u53c2\u8003git\u7537\u4eba\u624b\u518c<\/a>\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"
\u5982\u679c\u4f60\u5bf9\u4e8egit\u5b8c\u5168\u4e0d\u77e5\uff0c\u90a3\u4e48\u4e0d\u7528\u7740\u6025\uff0c\u6211\u4eec\u4e00\u8d77\u6765\u4ece\u96f6\u5f00\u59cb\u5b66\u4e60\u3002 1.\u96be\u9053git\u5c31\u662f\u50bb\u74dc\u7684\u610f\u601d\u5417\uff1f git\u662f\u4e00 […]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[110],"tags":[154,134,108],"class_list":["post-1454","post","type-post","status-publish","format-standard","hentry","category-linux","tag-git","tag-kernel","tag-linux"],"views":9079,"_links":{"self":[{"href":"http:\/\/edsionte.com\/techblog\/wp-json\/wp\/v2\/posts\/1454","targetHints":{"allow":["GET"]}}],"collection":[{"href":"http:\/\/edsionte.com\/techblog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"http:\/\/edsionte.com\/techblog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"http:\/\/edsionte.com\/techblog\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"http:\/\/edsionte.com\/techblog\/wp-json\/wp\/v2\/comments?post=1454"}],"version-history":[{"count":0,"href":"http:\/\/edsionte.com\/techblog\/wp-json\/wp\/v2\/posts\/1454\/revisions"}],"wp:attachment":[{"href":"http:\/\/edsionte.com\/techblog\/wp-json\/wp\/v2\/media?parent=1454"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/edsionte.com\/techblog\/wp-json\/wp\/v2\/categories?post=1454"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/edsionte.com\/techblog\/wp-json\/wp\/v2\/tags?post=1454"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}