\u5728\u7248\u672c\u7ba1\u7406\u7cfb\u7edf\u4e2d\uff0c\u662f\u7528\u6765\u5b58\u50a8\u7a0b\u5e8f\u548c\u6587\u4ef6\u7684\u5730\u65b9\u3002
\nGit\u53ef\u4ee5\u5904\u7406\u4e24\u79cd\u7c7b\u578b\u7684\u5b58\u50a8\u5e93\uff0c\u5373\u672c\u5730\u5b58\u50a8\u5e93\u548c\u8fdc\u7a0b\u5b58\u50a8\u5e93\u3002<\/p>\n
\u5f53\u524d\u4efb\u52a1\u6240\u5728\u7684\u4ee3\u7801\u5e93\u3002\u5982\u679c\u4e3b\u8981\u5728\u4e2a\u4eba\u7535\u8111\u6216\u5f00\u53d1\u670d\u52a1\u5668\u7b49\u8fdb\u884c\u5de5\u4f5c\uff0c\u90a3\u4e48\u5c31\u662f\u672c\u5730\u4ee3\u7801\u5e93\u3002\u53e6\u5916\uff0c\u8fd8\u53ef\u4ee5\u4ece\u8fdc\u7a0b\u4ee3\u7801\u5e93\u514b\u9686\u4ee3\u7801\u5e93\uff0c\u5e76\u5728\u4e2a\u4eba\u7535\u8111\u6216\u670d\u52a1\u5668\u4e0a\u6784\u5efa\u73af\u5883\u3002<\/p>\n
\u53ef\u4ee5\u4f7f\u7528\u5916\u90e8\u4ed3\u5e93\uff0c\u901a\u8fc7\u672c\u5730\u4ed3\u5e93\u5b9e\u73b0\u5bf9\u8fdc\u7a0b\u4ed3\u5e93\u7684\u64cd\u4f5c\u3002\u53ef\u7528\u4e8e\u591a\u4eba\u534f\u4f5c\u6216\u5728\u4e92\u8054\u7f51\u4e0a\u516c\u5f00\u3002<\/p>\n
\u7528\u6237\u80fd\u591f\u7f16\u8f91\u6216\u521b\u5efa\u65b0\u6587\u4ef6\u7684\u4f4d\u7f6e\u3002<\/p>\n
\u7f16\u8f91\u540e\u7684\u5de5\u4f5c\u533a\uff0c\u5728\u63d0\u4ea4\u5230\u4ed3\u5e93\u4e4b\u524d\uff0c\u4fdd\u5b58\u4e86\u4e0b\u4e00\u6b21\u63d0\u4ea4\u7684\u76ee\u6807\u72b6\u6001\u7684\u4f4d\u7f6e\u3002<\/p>\n
\u7528\u4e8e\u5c06\u5386\u53f2\u6d41\u7a0b\u5206\u53c9\u8bb0\u5f55\u7684\u5de5\u5177\u3002\u5206\u53c9\u7684\u5206\u652f\u4e0d\u53d7\u5176\u4ed6\u5206\u652f\u5f71\u54cd\uff0c\u56e0\u6b64\u5728\u540c\u4e00\u4e2a\u4ee3\u7801\u5e93\u4e2d\u53ef\u4ee5\u540c\u65f6\u8fdb\u884c\u591a\u4e2a\u66f4\u6539\u3002<\/p>\n
\u5728Git\u4e2d\u5b58\u5728\u4e09\u79cd\u7c7b\u578b\u7684\u5206\u652f\uff0c\u5305\u62ec\u672c\u5730\u5206\u652f\u3001\u8fdc\u7a0b\u5206\u652f\u548c\u8fdc\u7a0b\u8ddf\u8e2a\u5206\u652f\u3002<\/p>\n
\u5728\u672c\u5730\u4ed3\u5e93\u4e2d\u7ba1\u7406\u7684\u5206\u652f\u3002<\/p>\n
\u8fdc\u7a0b\u4ed3\u5e93\u4e2d\u7684\u5206\u652f\u3002<\/p>\n
\u5c06\u8fdc\u7a0b\u5206\u652f\u8ddf\u8e2a\u5230\u672c\u5730\u4ee3\u7801\u5e93\u7684\u5206\u652f\u3002
\n\u4f8b\u5982\uff0corigin\/master\u8868\u793a\u6b63\u5728\u8ddf\u8e2a\u4e00\u4e2a\u540d\u4e3aorigin\u7684\u8fdc\u7a0b\u4ee3\u7801\u5e93\u4e2d\u7684master\u5206\u652f\u3002<\/p>\n
\u5c06\u5b58\u50a8\u5e93\u4e2d\u7684\u5206\u652f\u5c55\u5f00\u5230\u5de5\u4f5c\u76ee\u5f55\u4e2d\u3002
\n\u5728Git\u4e2d\uff0c\u4e0d\u4ec5\u53ef\u4ee5\u68c0\u51fa\u5206\u652f\uff0c\u8fd8\u53ef\u4ee5\u68c0\u51fa\u6807\u7b7e\u3001\u7279\u5b9a\u63d0\u4ea4\u6216\u8fdc\u7a0b\u5b58\u50a8\u5e93\u7684\u5206\u652f\u7b49\u3002<\/p>\n
\u4e3a\u4f7f\u63d0\u4ea4\u66f4\u6613\u4e8e\u67e5\u627e\uff0c\u7ed9\u4e88\u4e00\u4e2a\u6613\u61c2\u7684\u540d\u79f0\u3002<\/p>\n
\u5bf9\u4e8e\u6587\u4ef6\u7684\u4fee\u6539\u6dfb\u52a0\u7684\u6d88\u606f<\/p>\n
Git\u4f7f\u7528\u54c8\u5e0c\u503c\u6765\u8fdb\u884c\u7248\u672c\u7ba1\u7406\uff0c\u6bcf\u6b21\u63d0\u4ea4\u90fd\u4f1a\u751f\u6210\u4e00\u4e2a\u54c8\u5e0c\u503c\u3002<\/p>\n
\u73fe\u5728\u6307\u5b9a\u7684\u4ee3\u540d\u8a5e\u662f\u6b63\u5728\u9032\u884c\u7d50\u5e33\u7684\u5206\u652f\u7684\u6700\u65b0\u63d0\u4ea4\u3002<\/p>\n
\u6307\u5b9a\u6700\u65b0\u63d0\u4ea4\u7684\u8fdc\u7a0b\u5206\u652f\u7684\u4ee3\u8bcd\u3002<\/p>\n
\u6307\u5411\u524d\u4e00\u4e2a\u5934\u90e8\u7684\u503c\u7684\u4ee3\u8bcd\u3002<\/p>\n
\u5728\u5408\u5e76\u8fc7\u7a0b\u4e2d\u751f\u6210\u7684\u6307\u4ee3\u201ccommit\u201d\uff0c\u8bb0\u5f55\u4e86\u8981\u5408\u5e76\u5230\u5206\u652f\u4e2d\u7684\u63d0\u4ea4\u3002<\/p>\n
<\/p>\n
<\/p>\n
<\/p>\n
#\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u4f5c\u6210\r\ngit init\r\n\r\nls a\r\n. .. .git\r\n\r\n#\u4f5c\u6210\u3055\u308c\u305f\u30d5\u30a9\u30eb\u30c0\u3068\u30d5\u30a1\u30a4\u30eb\r\ncd .git\r\nls\r\nHEAD description info refs\r\nconfig hooks objects\r\n<\/code><\/pre>\n\u521b\u5efa\u7528\u4e8eGit\u7684\u540d\u79f0\u548c\u5730\u5740\u3002<\/h3>\n#\u30b0\u30ed\u30fc\u30d0\u30eb\u8a2d\u5b9a\r\ngit config --global user.name \"username\"\r\ngit config --global user.email \"email\"\r\n\r\n#\u8a72\u5f53\u30ea\u30dd\u30b8\u30c8\u30ea\r\ngit config user.name \"username\"\r\ngit config user.email \"email\"\r\n<\/code><\/pre>\n\u57fa\u672c\u6307\u4ee4<\/h2>\n\u5c06\u6587\u4ef6\u6ce8\u518c\u5230\u7d22\u5f15\u4e2d\u3002<\/h3>\ngit add filename\r\n\r\n#\u30ab\u30ec\u30f3\u30c8\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306e\u6307\u5b9a\r\ngit add .\r\n\r\n#\u5168\u3066\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u767b\u9332\r\ngit add --all\r\n<\/code><\/pre>\n\u5c06\u66f4\u6539\u63d0\u4ea4\u5230\u672c\u5730\u4ed3\u5e93<\/h3>\n
\u5c06\u5df2\u5728\u7d22\u5f15\u4e2d\u6ce8\u518c\u7684\u6587\u4ef6\u66f4\u6539\u63d0\u4ea4\u5230\u4ee3\u7801\u5e93\u4e2d\u3002<\/p>\n
#\u30b3\u30df\u30c3\u30c8\r\ngit commit -m 'message'\r\n\r\n#\u30ef\u30fc\u30ad\u30f3\u30b0\u30c4\u30ea\u30fc\u304b\u3089\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u306b\u767b\u9332\u3057\uff0c\u30b3\u30df\u30c3\u30c8\u3059\u308b\r\ngit commit -am 'message'\r\n\r\n#\u30b3\u30df\u30c3\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8\u306e\u5909\u66f4\r\ngit commit --amend\r\n<\/code><\/pre>\n\u8f93\u51fa\u5dee\u5206<\/h3>\n
\u68c0\u67e5\u5de5\u4f5c\u6811\u548c\u7d22\u5f15\u7684\u5dee\u5f02\u3002<\/p>\n
git diff\r\n\r\n#\u6307\u5b9a\u306e\u30d5\u30a1\u30a4\u30eb\u306e\u5dee\u5206\r\ngit diff filename\r\n\r\n#\u30d6\u30e9\u30f3\u30c1\u3084\u30b3\u30df\u30c3\u30c8\u9593\u306e\u5dee\u5206\r\ngit diff \u30d6\u30e9\u30f3\u30c11 \u30d6\u30e9\u30f3\u30c12\r\n\r\n#checkout\u3057\u3066\u308b\u30d6\u30e9\u30f3\u30c1\u3068\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u3068\u306e\u5dee\u5206\r\ngit diff --cached\r\n<\/code><\/pre>\n\u5c55\u793a\u63d0\u4ea4\u65e5\u5fd7<\/h3>\n#\u30b3\u30df\u30c3\u30c8\u30ed\u30b0\u3092\u51fa\u529b\u3059\u308b\r\ngit log\r\n\r\n#\u30b3\u30df\u30c3\u30c8\u30ed\u30b0\u3092\u8981\u7d04\u3057\u3066\u51fa\u529b\u3059\u308b\r\ngit shortlog\r\n\r\n#\u30b3\u30df\u30c3\u30c8\u30ed\u30b0\u30921\u884c\u3067\u51fa\u529b\u3059\u308b\r\ngit log --oneline\r\n<\/code><\/pre>\n\u786e\u8ba4\u672c\u5730\u4ed3\u5e93\u548c\u5de5\u4f5c\u76ee\u5f55\u7684\u72b6\u6001<\/h3>\ngit status\r\n<\/code><\/pre>\n\u5173\u4e8e\u63d0\u4ea4\u7684\u663e\u793a<\/h4>\n\n- \n
On branch master<\/ul>\n<\/li>\n<\/ul>\n\u3053\u306e\u72b6\u614b\u3067\u30b3\u30df\u30c3\u30c8\u3059\u308b\u3068\uff0cmaster\u30d6\u30e9\u30f3\u30c1\u306b\u30b3\u30df\u30c3\u30c8\u3055\u308c\u308b<\/p>\n
nothing to commit<\/p>\n
\u30ef\u30fc\u30ad\u30f3\u30b0\u30c4\u30ea\u30fc\u3068\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u306b\u5bfe\u3057\u3066\u5909\u66f4\u304c\u306a\u3044\uff0e<\/p>\n
Changes to be committed<\/p>\n
\u8868\u793a\u3055\u308c\u3066\u3044\u308b\u30d5\u30a1\u30a4\u30eb\u304c\u6b21\u56de\u306e\u30b3\u30df\u30c3\u30c8\u306e\u5bfe\u8c61\u3068\u306a\u3063\u3066\u3044\u308b\uff0e<\/p>\n
Changed but not updated<\/p>\n
\u30ef\u30fc\u30ad\u30f3\u30b0\u30c4\u30ea\u30fc\u3067\u5909\u66f4\u3055\u308c\u3066\u3044\u308b\u304c\uff0c\u305d\u306e\u5909\u66f4\u304c\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u306b\u767b\u9332\u3055\u308c\u3066\u3044\u306a\u3044\u3053\u3068\u3092\u8868\u3059\uff0e<\/p>\n
Untracked files<\/p>\n
\u30ef\u30fc\u30ad\u30f3\u30b0\u30c4\u30ea\u30fc\u306b\u5b58\u5728\u3059\u308b\u304cGit\u306e\u7ba1\u7406\u5bfe\u8c61\u3068\u306a\u3063\u3066\u3044\u306a\u3044\uff0e<\/p>\n
\u663e\u793a\u6709\u5173\u6587\u4ef6\u72b6\u6001\u7684\u4fe1\u606f<\/h3>\n\n- \n
new file<\/ul>\n<\/li>\n<\/ul>\n\u65b0\u3057\u304f\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u306b\u8868\u793a\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb<\/p>\n
modified<\/p>\n
\u30ef\u30fc\u30ad\u30f3\u30b0\u30c4\u30ea\u30fc\u3084\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u306e\u72b6\u614b\u304b\u3089\u5909\u66f4\u3055\u308c\u3066\u3044\u308b\u3053\u3068\u3092\u8868\u3059\uff0e<\/p>\n
renamed<\/p>\n
\u30d5\u30a1\u30a4\u30eb\u3092\u79fb\u52d5\u3057\u305f\u308a\uff0c\u30d5\u30a3\u30a2\u30eb\u540d\u3092\u5909\u66f4\u3057\u305f\u308a\u3057\u305f\u5834\u5408\u306b\u8868\u793a\u3055\u308c\u308b\uff0e<\/p>\n
deleted<\/p>\n
\u30d5\u30a1\u30a4\u30eb\u3092\u524a\u9664\u3057\u305f\u5834\u5408\u306b\u8868\u793a\u3055\u308c\u308b\uff0e<\/p>\n
both modified<\/p>\n
\u30de\u30fc\u30b8\u3084\u30ea\u30d9\u30fc\u30b9\u306b\u5931\u6557\u3057\u305f\u5834\u5408\u3067\uff0c\u8907\u6570\u306e\u30d6\u30e9\u30f3\u30c1\u3067\u5909\u66f4\u304c\u52a0\u3048\u3089\u308c\u3066\u3044\u308b\u30d5\u30a1\u30a4\u30eb\u306b\u5bfe\u3057\u3066\u8868\u793a\u3055\u308c\u308b\uff0e<\/p>\n
unmerged<\/p>\n
\u30de\u30fc\u30b8\u3084\u30ea\u30d9\u30fc\u30b9\u306b\u5931\u6557\u3057\u305f\u5834\u5408\u3067\uff0cboth modified\u4ee5\u5916\u306e\u6642\u306b\u8868\u793a\u3055\u308c\u308b\uff0e<\/p>\n
\u6587\u4ef6\u7684\u79fb\u52a8\u3001\u4fee\u6539\/\u5220\u9664<\/h3>\n#\u79fb\u52d5\u30fb\u5909\u66f4\r\ngit mv\r\n\r\n#\u524a\u9664\r\ngit rm\r\n<\/code><\/pre>\n\u6839\u636e\u672c\u5730\u4ed3\u5e93\u548c\u7d22\u5f15\u7684\u72b6\u6001\u8fdb\u884c\u6062\u590d\u3002<\/h3>\n#HEAD\u306e\u53c2\u7167\u3068\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\uff0c\u30ef\u30fc\u30ad\u30f3\u30b0\u30c4\u30ea\u30fc\u306e\u72b6\u614b\u3092\u623b\u3059\r\ngit reset --hard\r\n\r\n#HEAD\u306e\u53c2\u7167\u306e\u307f\u3092\u5909\u66f4\u3059\u308b\r\ngit reset --soft\r\n\r\n#HEAD\u306e\u53c2\u7167\u3068\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u3092\u5909\u66f4\u3059\u308b.git reset\u306e\u30c7\u30d5\u30a9\u30eb\u30c8\r\ngit reset -mixed\r\n<\/code><\/pre>\n\u6574\u7406\u5de5\u4f5c\u533a<\/h3>\n#\u30ea\u30dd\u30b8\u30c8\u30ea\u3067\u7ba1\u7406\u3055\u308c\u3066\u3044\u306a\u3044\u30d5\u30a1\u30a4\u30eb\u306e\u524a\u9664\r\ngit clean -f\r\n\r\n#\u524a\u9664\u3055\u308c\u308b\u30d5\u30a1\u30a4\u30eb\u306e\u78ba\u8a8d\r\ngit clean -n\r\n\r\n#\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306e\u524a\u9664\r\ngit clean -d\r\n<\/code><\/pre>\n\u641c\u7d22\u7279\u5b9a\u7684\u5b57\u7b26\u4e32<\/h3>\ngit grep XXX\r\n<\/code><\/pre>\n\u663e\u793a\u63d0\u4ea4\u5185\u5bb9<\/h3>\ngit show\r\n<\/code><\/pre>\n\u5982\u679c\u4f7f\u7528\u8fdc\u7a0b\u4ed3\u5e93\u7684\u8bdd<\/h2>\n\u514b\u9686\u8fdc\u7a0b\u4ee3\u7801\u5e93<\/h3>\ngit clone \u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\r\n<\/code><\/pre>\n\u6ce8\u518c\/\u66f4\u65b0\/\u5220\u9664\u8fdc\u7a0b\u8d44\u6e90\u5e93<\/h3>\n#\u767b\u9332\r\ngit remote add \u30ea\u30dd\u30b8\u30c8\u30ea\u540d \u30d1\u30b9\r\n\r\n#\u66f4\u65b0\r\ngit remote update\r\n#\u7279\u5b9a\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u66f4\u65b0\r\ngit remote update \u30ea\u30dd\u30b8\u30c8\u30ea\u540d\r\n\r\n#\u524a\u9664\r\ngit remote rm \u30ea\u30dd\u30b8\u30c8\u30ea\u540d\r\n\r\n#\u5b58\u5728\u3057\u306a\u304f\u306a\u3063\u305f\u30d6\u30e9\u30f3\u30c1\u306e\u524a\u9664\r\ngit remote prune\r\n<\/code><\/pre>\n\u5c06\u8fdc\u7a0b\u4ed3\u5e93\u7684\u6570\u636e\u540c\u6b65\u5230\u672c\u5730\u4ed3\u5e93\u3002<\/h3>\n#\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u3068\u30d6\u30e9\u30f3\u30c1\u3092\u6307\u5b9a\u3057\u3066\u53cd\u6620\r\ngit pull origin \u30ea\u30e2\u30fc\u30c8\u30d6\u30e9\u30f3\u30c1\r\n<\/code><\/pre>\n\u5173\u4e8egit pull\u547d\u4ee4\u7684\u8bf4\u660e<\/h3>\n
git pull\u547d\u4ee4\u662fgit fetch\u547d\u4ee4\u548cgit merge\u547d\u4ee4\u7684\u7ed3\u5408\u3002<\/p>\n
\u4ece\u8fdc\u7a0b\u5b58\u50a8\u5e93\u83b7\u53d6\u5b58\u50a8\u5e93\u6570\u636e\u3002<\/h3>\n#\u30ea\u30dd\u30b8\u30c8\u30ea\u304c\u767b\u9332\u6e08\u307f\u306e\u72b6\u614b\u3067\u30d6\u30e9\u30f3\u30c1\u3092\u6307\u5b9a\r\ngit fetch origin \u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\r\n<\/code><\/pre>\n\u53d6\u5f97\u7684\u6570\u636e\u5c06\u4f5c\u4e3aFETCH_HEAD\u8fdb\u884c\u68c0\u51fa\u3002<\/p>\n
fetch\u548cremote update\u7684\u533a\u522b<\/h4>\n\n- \n
fetch<\/ul>\n<\/li>\n<\/ul>\n\u30d6\u30e9\u30f3\u30c1\u5358\u4f4d\u3067\u5909\u66f4\u3092\u53d6\u5f97<\/p>\n
remote update<\/p>\n
\u30ea\u30dd\u30b8\u30c8\u30ea\u5358\u4f4d\u3067\u5909\u66f4\u3092\u53d6\u5f97<\/p>\n
\u5408\u5e76\u5206\u652f<\/h3>\n#\u30d6\u30e9\u30f3\u30c1\u3092\u6307\u5b9a\u3057\u3066\u30de\u30fc\u30b8\r\ngit merge \u30d6\u30e9\u30f3\u30c1\u540d\r\n\r\n#\u30b3\u30df\u30c3\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8\u3092\u6307\u5b9a\u3057\u3066\u30de\u30fc\u30b8\r\ngit merge \u30d6\u30e9\u30f3\u30c1\u540d -m 'message'\r\n<\/code><\/pre>\n\u5c06\u672c\u5730\u5b58\u50a8\u5e93\u7684\u6570\u636e\u53d1\u9001\u5230\u8fdc\u7a0b\u5b58\u50a8\u5e93\u3002<\/h3>\n#\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u300corigin\u300d\u306b\u300cmaster\u300d\u30d6\u30e9\u30f3\u30c1\u3092\u9001\u4fe1\r\ngit push origin \u30ed\u30fc\u30ab\u30eb\u30d6\u30e9\u30f3\u30c1\u540d\r\n\r\n#\u53cd\u6620\u5148\u306e\u30d6\u30e9\u30f3\u30c1\u3092\u6307\u5b9a\r\ngit push origin \u30ed\u30fc\u30ab\u30eb\u30d6\u30e9\u30f3\u30c1\u540d:\u30ea\u30e2\u30fc\u30c8\u30d6\u30e9\u30f3\u30c1\u540d\r\n<\/code><\/pre>\n\u5982\u679cgit push\u51fa\u73b0\u9519\u8bef\u7684\u60c5\u51b5<\/h4>\n\n- \n
\u3069\u3061\u3089\u304b\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u3057\u304b\u306a\u3044\u30b3\u30df\u30c3\u30c8\u304c\u3042\u308b\u5834\u5408<\/ul>\n<\/li>\n<\/ul>\n <\/p>\n
\u30ea\u30e2\u30fc\u30c8\u30d6\u30e9\u30f3\u30c1\u304c\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u3055\u308c\u3066\u3044\u308b\u5834\u5408<\/ul>\n\u521b\u5efa\/\u786e\u8ba4\/\u4fee\u6539\/\u5220\u9664\u5206\u652f<\/h3>\n#\u30ed\u30fc\u30ab\u30eb\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u4f5c\u6210\r\ngit branch \u30d6\u30e9\u30f3\u30c1\u540d\r\n\r\n#\u30ed\u30fc\u30ab\u30eb\u30d6\u30e9\u30f3\u30c1\u306e\u78ba\u8a8d\r\ngit branch \r\n\r\n#\u30ea\u30e2\u30fc\u30c8\u30c8\u30e9\u30c3\u30ad\u30f3\u30b0\u30d6\u30e9\u30f3\u30c1\u306e\u78ba\u8a8d\r\ngit branch -r\r\n\r\n#\u30d6\u30e9\u30f3\u30c1\u6bce\u306e\u6700\u65b0\u30b3\u30df\u30c3\u30c8\u306e\u78ba\u8a8d\r\ngit branch -v\r\n\r\n#\u30d6\u30e9\u30f3\u30c1\u540d\u306e\u5909\u66f4\r\ngit branch -m \u30d6\u30e9\u30f3\u30c1\u540d(old) \u30d6\u30e9\u30f3\u30c1\u540d(new)\r\n\r\n#\u30d6\u30e9\u30f3\u30c1\u306e\u524a\u9664\r\ngit branch -d \u30d6\u30e9\u30f3\u30c1\u540d\r\n\r\n#\u30ea\u30e2\u30fc\u30c8\u30d6\u30e9\u30f3\u30c1\u306e\u524a\u9664(\u30ed\u30fc\u30ab\u30eb\u30d6\u30e9\u30f3\u30c1\u3092\u524a\u9664\u3057\u305f\u5f8c)\r\ngit push origin :\u30d6\u30e9\u30f3\u30c1\u540d\r\n<\/code><\/pre>\n\u5206\u652f\u68c0\u51fa<\/h3>\ngit checkout \u30d6\u30e9\u30f3\u30c1\u540d\r\n<\/code><\/pre>\n\u5728\u5de5\u4f5c\u533a\u6216\u7d22\u5f15\u4e2d\u8fdb\u884c\u66f4\u6539\u5e76\u8fdb\u884c\u68c0\u51fa\uff0c\u6539\u52a8\u5c06\u76f4\u63a5\u53cd\u6620\u5230\u5176\u4ed6\u5206\u652f\u4e2d\u3002
\n\u7136\u800c\uff0c\u5728\u68c0\u51fa\u5230\u76ee\u6807\u5206\u652f\u65f6\uff0c\u5982\u679c\u540c\u4e00\u6587\u4ef6\u6709\u66f4\u6539\uff0c\u5219\u4f1a\u51fa\u73b0\u9519\u8bef\u3002<\/p>\n
\u6dfb\u52a0\u6807\u7b7e<\/h3>\n#\u30bf\u30b0\u4e00\u89a7\r\ngit tag\r\n\r\n#\u30bf\u30b0\u3092\u4ed8\u3051\u308b\r\ngit tag \u30bf\u30b0\u540d \u30ea\u30d3\u30b8\u30e7\u30f3\r\n\r\n#\u30bf\u30b0\u306b\u30e1\u30c3\u30bb\u30fc\u30b8\u3092\u4ed8\u3051\u308b\r\ngit tag -m 'message'\r\n\r\n#\u30ea\u30e2\u30fc\u30c8\u306b\u53cd\u6620\r\ngit push origin \u30bf\u30b0\u540d\r\n\r\n#\u30bf\u30b0\u306e\u524a\u9664\r\ngit tag -d \u30bf\u30b0\u540d\r\n\r\n#\u76f4\u8fd1\u306e\u30bf\u30b0\u306e\u8868\u793a\r\ngit describe\r\n<\/code><\/pre>\n\u5c06\u8ddf\u968f\u90a3\u4e2a\u5df2\u7ecf\u68c0\u51fa\u6307\u5b9a\u5206\u652f\u7684\u5206\u652f\u6240\u505a\u7684\u63d0\u4ea4<\/h3>\ngit rebase \u30d6\u30e9\u30f3\u30c1\u540d\r\n<\/code><\/pre>\n\u5982\u679c\u4eceMaster\u5206\u652f\u5207\u6362\u5230\u540d\u4e3aTest\u7684\u5206\u652f\uff0c\u5e76\u8fdb\u884c\u7f16\u8f91\u3001\u6ce8\u518c\u548c\u63d0\u4ea4\u4ee5\u8fdb\u884cRebase\uff0c\u90a3\u4e48Master\u5206\u652f\u7684HEAD\u5c06\u8ffd\u968fTest\u5206\u652f\u7684\u63d0\u4ea4\u3002<\/p>\n
merge\u548crebase\u7684\u533a\u522b<\/h3>\n\n- \n
merge<\/ul>\n<\/li>\n<\/ul>\n\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u3057\u3066\u3044\u308b\u30d6\u30e9\u30f3\u30c1\u306b\u3042\u308b\u30b3\u30df\u30c3\u30c8\u3092\u5909\u66f4\u305b\u305a\uff0c\u5404\u30d6\u30e9\u30f3\u30c1\u3092\u30de\u30fc\u30b8\u3059\u308b<\/p>\n
rebase<\/p>\n
\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u3057\u3066\u3044\u308b\u30d6\u30e9\u30f3\u30c1\u306e\u30b3\u30df\u30c3\u30c8\u3092\u6307\u5b9a\u3057\u305f\u30d6\u30e9\u30f3\u30c1\u306e\u6700\u65b0\u30b3\u30df\u30c3\u30c8\u306b\u8ffd\u5f93\u3055\u305b\u308b\uff0e<\/p>\n
\u6362\u53e5\u8bdd\u8bf4\uff0c\u5728\u5408\u5e76\uff08merge\uff09\u548c\u53d8\u57fa\uff08rebase\uff09\u65f6\uff0c\u63d0\u4ea4\uff08commit\uff09\u4f1a\u6709\u6240\u4e0d\u540c\u3002<\/p>\n
\u4fbf\u5229\u6307\u4ee4<\/h2>\n\u521b\u5efa\u6307\u5b9a\u63d0\u4ea4\u7684\u5feb\u7167<\/h3>\ngit archive --format=\u30d5\u30a9\u30fc\u30de\u30c3\u30c8\u540d --prefix=\u5c55\u958b\u5f8c\u306e\u30d5\u30a1\u30a4\u30eb\u540d \u30b3\u30df\u30c3\u30c8\u540d > \u30d5\u30a1\u30a4\u30eb\u540d\r\n<\/code><\/pre>\n\u4e34\u65f6\u4fdd\u5b58\u63d0\u4ea4\u72b6\u6001<\/h3>\n#\u4fdd\u5b58\r\ngit stash\r\n\r\n#\u30e1\u30c3\u30bb\u30fc\u30b8\u3092\u4ed8\u3051\u3066\u4fdd\u5b58\r\ngit stash save \u30e1\u30c3\u30bb\u30fc\u30b8\r\n\r\n#\u4fdd\u5b58\u3055\u308c\u305f\u30ea\u30b9\u30c8\u306e\u8868\u793a\r\ngit stash list\r\n\r\n#\u4fdd\u5b58\u3055\u308c\u305f\u5185\u5bb9\u3092\u623b\u3059\r\ngit stash pop\r\n\r\n#\u4fdd\u5b58\u3055\u308c\u305f\u5185\u5bb9\u3092\u5168\u3066\u524a\u9664\r\ngit stash clear\r\n<\/code><\/pre>\n\u67e5\u627e\u4e0d\u5305\u542b\u5728\u5206\u652f\u4e2d\u7684\u63d0\u4ea4<\/h3>\ngit cherry -v \u8abf\u67fb\u5143 \u8abf\u67fb\u5148\r\n<\/code><\/pre>\n\u5c06\u7279\u5b9a\u7684\u63d0\u4ea4\u5408\u5e76\u5230\u5206\u652f\u4e2d<\/h3>\ngit cherry-pick \u53d6\u308a\u8fbc\u307f\u305f\u3044\u30b3\u30df\u30c3\u30c8\r\n<\/code><\/pre>\n\u786e\u5b9a\u4e86\u5b58\u5728bug\u7684\u4f4d\u7f6e<\/h3>\ngit bisect start\r\ngit bisect good\r\ngit bisect bad\r\n\r\n#\u81ea\u52d5\u5b9f\u884c\r\ngit bisect run\r\n<\/code><\/pre>\n\u6574\u7406\u5b58\u50a8\u5e93\u4e2d\u7684\u5bf9\u8c61<\/h3>\ngit gc\r\n<\/code><\/pre>\n\u663e\u793a\u63d0\u4ea4\u5386\u53f2\u7684\u65f6\u95f4\u987a\u5e8f<\/h3>\ngit reflog\r\n<\/code><\/pre>\nrefspec\u662f\u4ec0\u4e48<\/h3>\n
refspec\u662f\u5c06\u672c\u5730\u5b58\u50a8\u5e93\u548c\u8fdc\u7a0b\u5b58\u50a8\u5e93\u7684\u5206\u652f\u7b49\u8fdb\u884c\u5173\u8054\u7684\u5185\u5bb9\u3002<\/p>\n
git push origin refs\/hands\/\u8fdc\u7a0b\u5206\u652f(\u6e90\u53c2\u8003):refs\/hands\/\u672c\u5730\u5206\u652f(\u76ee\u6807\u53c2\u8003)<\/p>\n
\u540c\u65f6\uff0c\u4e5f\u53ef\u4ee5\u5728config\u4e2d\u8fdb\u884c\u6307\u5b9a\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"
Git\u901f\u67e5\u8868 \u4f7f\u7528\u7684\u8a5e\u5f59 \u50a8\u5b58\u5e93 \u5728\u7248\u672c\u7ba1\u7406\u7cfb\u7edf\u4e2d\uff0c\u662f\u7528\u6765\u5b58\u50a8\u7a0b\u5e8f\u548c\u6587\u4ef6\u7684\u5730\u65b9\u3002 Git\u53ef\u4ee5\u5904\u7406\u4e24\u79cd\u7c7b\u578b\u7684\u5b58\u50a8 […]<\/p>\n","protected":false},"author":12,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-37650","post","type-post","status-publish","format-standard","hentry","category-uncategorized"],"yoast_head":"\n
Git\u901f\u67e5\u8868 - 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\u901f\u67e5\u8868-10\/\" \/>\n<meta property=\"og:locale\" content=\"zh_CN\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"Git\u901f\u67e5\u8868\" \/>\n<meta property=\"og:description\" content=\"Git\u901f\u67e5\u8868 \u4f7f\u7528\u7684\u8a5e\u5f59 \u50a8\u5b58\u5e93 \u5728\u7248\u672c\u7ba1\u7406\u7cfb\u7edf\u4e2d\uff0c\u662f\u7528\u6765\u5b58\u50a8\u7a0b\u5e8f\u548c\u6587\u4ef6\u7684\u5730\u65b9\u3002 Git\u53ef\u4ee5\u5904\u7406\u4e24\u79cd\u7c7b\u578b\u7684\u5b58\u50a8 […]\" \/>\n<meta property=\"og:url\" content=\"https:\/\/www.silicloud.com\/zh\/blog\/git\u901f\u67e5\u8868-10\/\" \/>\n<meta property=\"og:site_name\" content=\"Blog - Silicon Cloud\" \/>\n<meta property=\"article:published_time\" content=\"2023-05-20T09:54:07+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2024-05-04T03:43:19+00:00\" \/>\n<meta name=\"author\" content=\"\u9038, \u79d1\" \/>\n<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n<meta name=\"twitter:label1\" content=\"\u4f5c\u8005\" \/>\n\t<meta name=\"twitter:data1\" content=\"\u9038, \u79d1\" \/>\n\t<meta name=\"twitter:label2\" content=\"\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4\" \/>\n\t<meta name=\"twitter:data2\" content=\"2 \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%e9%80%9f%e6%9f%a5%e8%a1%a8-10\/\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e9%80%9f%e6%9f%a5%e8%a1%a8-10\/\",\"name\":\"Git\u901f\u67e5\u8868 - Blog - Silicon Cloud\",\"isPartOf\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\"},\"datePublished\":\"2023-05-20T09:54:07+00:00\",\"dateModified\":\"2024-05-04T03:43:19+00:00\",\"author\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/85c1dae56e6ea1e695c73d33c684d487\"},\"breadcrumb\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e9%80%9f%e6%9f%a5%e8%a1%a8-10\/#breadcrumb\"},\"inLanguage\":\"zh-Hans\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/www.silicloud.com\/zh\/blog\/git%e9%80%9f%e6%9f%a5%e8%a1%a8-10\/\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e9%80%9f%e6%9f%a5%e8%a1%a8-10\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u9996\u9875\",\"item\":\"https:\/\/www.silicloud.com\/zh\/blog\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"Git\u901f\u67e5\u8868\"}]},{\"@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\/85c1dae56e6ea1e695c73d33c684d487\",\"name\":\"\u9038, \u79d1\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/\",\"url\":\"https:\/\/secure.gravatar.com\/avatar\/c94f6d9cbbfbca863fab309840bd690c153c95f8490c290ad2ed54dd693dad16?s=96&d=mm&r=g\",\"contentUrl\":\"https:\/\/secure.gravatar.com\/avatar\/c94f6d9cbbfbca863fab309840bd690c153c95f8490c290ad2ed54dd693dad16?s=96&d=mm&r=g\",\"caption\":\"\u9038, \u79d1\"},\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/author\/keyi\/\"},{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e9%80%9f%e6%9f%a5%e8%a1%a8-10\/#local-main-organization-logo\",\"url\":\"\",\"contentUrl\":\"\",\"caption\":\"Blog - Silicon Cloud\"}]}<\/script>\n<!-- \/ Yoast SEO Premium plugin. -->","yoast_head_json":{"title":"Git\u901f\u67e5\u8868 - 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\u901f\u67e5\u8868-10\/","og_locale":"zh_CN","og_type":"article","og_title":"Git\u901f\u67e5\u8868","og_description":"Git\u901f\u67e5\u8868 \u4f7f\u7528\u7684\u8a5e\u5f59 \u50a8\u5b58\u5e93 \u5728\u7248\u672c\u7ba1\u7406\u7cfb\u7edf\u4e2d\uff0c\u662f\u7528\u6765\u5b58\u50a8\u7a0b\u5e8f\u548c\u6587\u4ef6\u7684\u5730\u65b9\u3002 Git\u53ef\u4ee5\u5904\u7406\u4e24\u79cd\u7c7b\u578b\u7684\u5b58\u50a8 […]","og_url":"https:\/\/www.silicloud.com\/zh\/blog\/git\u901f\u67e5\u8868-10\/","og_site_name":"Blog - Silicon Cloud","article_published_time":"2023-05-20T09:54:07+00:00","article_modified_time":"2024-05-04T03:43:19+00:00","author":"\u9038, \u79d1","twitter_card":"summary_large_image","twitter_misc":{"\u4f5c\u8005":"\u9038, \u79d1","\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4":"2 \u5206"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"WebPage","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e9%80%9f%e6%9f%a5%e8%a1%a8-10\/","url":"https:\/\/www.silicloud.com\/zh\/blog\/git%e9%80%9f%e6%9f%a5%e8%a1%a8-10\/","name":"Git\u901f\u67e5\u8868 - Blog - Silicon Cloud","isPartOf":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website"},"datePublished":"2023-05-20T09:54:07+00:00","dateModified":"2024-05-04T03:43:19+00:00","author":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/85c1dae56e6ea1e695c73d33c684d487"},"breadcrumb":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e9%80%9f%e6%9f%a5%e8%a1%a8-10\/#breadcrumb"},"inLanguage":"zh-Hans","potentialAction":[{"@type":"ReadAction","target":["https:\/\/www.silicloud.com\/zh\/blog\/git%e9%80%9f%e6%9f%a5%e8%a1%a8-10\/"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e9%80%9f%e6%9f%a5%e8%a1%a8-10\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u9996\u9875","item":"https:\/\/www.silicloud.com\/zh\/blog\/"},{"@type":"ListItem","position":2,"name":"Git\u901f\u67e5\u8868"}]},{"@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\/85c1dae56e6ea1e695c73d33c684d487","name":"\u9038, \u79d1","image":{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/","url":"https:\/\/secure.gravatar.com\/avatar\/c94f6d9cbbfbca863fab309840bd690c153c95f8490c290ad2ed54dd693dad16?s=96&d=mm&r=g","contentUrl":"https:\/\/secure.gravatar.com\/avatar\/c94f6d9cbbfbca863fab309840bd690c153c95f8490c290ad2ed54dd693dad16?s=96&d=mm&r=g","caption":"\u9038, \u79d1"},"url":"https:\/\/www.silicloud.com\/zh\/blog\/author\/keyi\/"},{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e9%80%9f%e6%9f%a5%e8%a1%a8-10\/#local-main-organization-logo","url":"","contentUrl":"","caption":"Blog - Silicon Cloud"}]}},"_links":{"self":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37650","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\/12"}],"replies":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/comments?post=37650"}],"version-history":[{"count":2,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37650\/revisions"}],"predecessor-version":[{"id":98118,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37650\/revisions\/98118"}],"wp:attachment":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/media?parent=37650"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/categories?post=37650"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/tags?post=37650"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}