Git\u662f\u7528\u4e8e\u6587\u4ef6\u7248\u672c\u7ba1\u7406\u7684\u5de5\u5177\u3002\u5982\u679c\u4e0d\u8fdb\u884c\u7248\u672c\u7ba1\u7406\uff0c\u5c31\u65e0\u6cd5\u77e5\u9053\u6700\u65b0\u72b6\u6001\uff0c\u4e5f\u65e0\u6cd5\u77e5\u9053\u8c01\u5728\u4f55\u65f6\u505a\u4e86\u4f55\u79cd\u66f4\u6539\u3002\u6b64\u5916\uff0c\u8fd8\u53ef\u80fd\u51fa\u73b0\u8986\u76d6\u4fee\u6539\u7684\u98ce\u9669\u3002\u4e3a\u4e86\u9632\u6b62\u8fd9\u4e9b\u95ee\u9898\uff0c\u4eba\u4eec\u4f7f\u7528Git\u3002<\/p>\n
\u4ee5\u4e0b\u662f\u4e00\u4e2a\u9009\u9879\uff0c\u7528\u4e2d\u6587\u672c\u5730\u8bed\u8a00\u91cd\u65b0\u8868\u8ff0:<\/p>\n
\u3010\u7ec4\u6210\u3011
\n\u4e2a\u4eba\u6587\u4ef6 \u2192 \u6682\u5b58\u533a \u2192 \u672c\u5730\u4ed3\u5e93 \u2192 \u8fdc\u7a0b\u4ed3\u5e93
\n\u4e2a\u4eba\u6587\u4ef6 \u2192 \u6682\u5b58\u533a\uff1agit add
\n\u6682\u5b58\u533a \u2192 \u672c\u5730\u4ed3\u5e93\uff1agit commit
\n\u672c\u5730\u4ed3\u5e93 \u2192 \u8fdc\u7a0b\u4ed3\u5e93\uff1agit push
\n\u8fdc\u7a0b\u4ed3\u5e93 \u2192 \u672c\u5730\u4ed3\u5e93\uff1agit pull<\/p>\n
\u30fb\u7248\u672c\u786e\u8ba4<\/p>\n
git version\r\n<\/code><\/pre>\n\u30fb\u6700\u521d\u8bbe\u7f6e<\/p>\n
\u3007\u30e6\u30fc\u30b6\u30fc\u540d\u767b\u9332\r\n git config --global user.name \"github user name\"\r\n git config user.name\u3067\u767b\u9332\u78ba\u8a8d\r\n\u3007\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u767b\u9332\r\n git config --global user.email \"github@useremail\"\r\n git config user.email\u3067\u767b\u9332\u78ba\u8a8d\r\n\u3007\u4f7f\u7528\u30a8\u30c7\u30a3\u30bf\u306e\u767b\u9332\r\n git config --global core.editor \"atom --wait\"\r\n git config core.editor\u3067\u767b\u9332\u78ba\u8a8d\r\n<\/code><\/pre>\n\u5728\u672c\u5730\u521b\u5efa\u5b58\u50a8\u5e93
\n\u5b58\u50a8\u5e93\u662f\u8bb0\u5f55\u6587\u4ef6\u548c\u76ee\u5f55\u72b6\u6001\u4ee5\u53ca\u53d8\u66f4\u5386\u53f2\u7684\u5730\u65b9\u3002
\n\u901a\u8fc7”git init”\u547d\u4ee4\u521b\u5efa\u65b0\u7684\u5b58\u50a8\u5e93
\n\u2192 \u5728\u521b\u5efa.git\u76ee\u5f55\uff0c\u5e76\u5c06\u6587\u4ef6\u5b58\u50a8\u5728\u5176\u4e2d\uff0c\u6bcf\u6b21\u66f4\u6539\u90fd\u4f1a\u88ab\u5b58\u50a8\u3002<\/p>\n
\u5c06\u5df2\u7ecf\u5b58\u5728\u4e8eGithub\u4e0a\u7684\u9879\u76ee\u590d\u5236\u5230\u672c\u5730\u3002<\/p>\n
git clone\u3000<Github\u4e0a\u306e\u30a2\u30c9\u30ec\u30b9>\r\n<\/code><\/pre>\n\u30fb\u786e\u8ba4\u66f4\u6539<\/p>\n
\u3007\u5909\u66f4\u78ba\u8a8d\r\n git diff :\u500b\u4eba\u30d5\u30a1\u30a4\u30eb\u3068\u30b9\u30c6\u30fc\u30b8\u30f3\u30b0\u30a8\u30ea\u30a2\u3068\u306e\u9055\u3044\r\n git diff --staged :\u30b9\u30c6\u30fc\u30b8\u30f3\u30b0\u30a8\u30ea\u30a2\u3068\u30ed\u30fc\u30ab\u30eb\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u9055\u3044\r\n\r\n\u3007\u5909\u66f4\u5c65\u6b74\u306e\u78ba\u8a8d\r\n git log --oneline #\u4e00\u884c\u3067\u8868\u793a\u3059\u308b\r\n git log -p index.html #\u30d5\u30a1\u30a4\u30eb\u306e\u5909\u66f4\u5dee\u5206\u3092\u8868\u793a\u3059\u308b\r\n git log -n <\u30b3\u30df\u30c3\u30c8\u6570> #\u8868\u793a\u3059\u308b\u30b3\u30df\u30c3\u30c8\u6570\u3092\u5236\u9650\u3059\u308b\r\n<\/code><\/pre>\n\u30fb\u5220\u9664<\/p>\n
\u3007\u30d5\u30a1\u30a4\u30eb\u306e\u524a\u9664(\u30ed\u30fc\u30ab\u30eb\u30ea\u30dd\u30b8\u30c8\u30ea\u3068\u30d5\u30a1\u30a4\u30eb\u81ea\u8eab)\r\n git rm <\u30d5\u30a1\u30a4\u30eb\u540d>\r\n git rm <\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u540d>\r\n\r\n\u3007\u30d5\u30a1\u30a4\u30eb\u3092\u6b8b\u3057\u305f\u3044\u3068\u304d(\u30ed\u30fc\u30ab\u30eb\u30ea\u30dd\u30b8\u30c8\u30ea\u304b\u3089\u306f\u524a\u9664\u3059\u308b\u304c\u3001\u30d5\u30a1\u30a4\u30eb\u81ea\u8eab\u306f\u6b8b\u3059)\r\n git rm --cached <\u30d5\u30a1\u30a4\u30eb\u540d>\r\n<\/code><\/pre>\n\u53d6\u6d88<\/p>\n
\u30fb\u5909\u66f4\u3092\u53d6\u308a\u6d88\u3059\r\ngit checkout -- <\u30d5\u30a1\u30a4\u30eb\u540d> #\u500b\u4eba\u30d5\u30a1\u30a4\u30eb\u306e\u5fa9\u5143\r\ngit checkout -- <\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u540d> #\u500b\u4eba\u30d5\u30a1\u30a4\u30eb\u306e\u5fa9\u5143\r\ngit checkout -- . #\u5168\u5909\u66f4\u3092\u53d6\u308a\u6d88\u3059\r\ngit reset HEAD <\u30d5\u30a1\u30a4\u30eb\u540d> #\u30b9\u30c6\u30fc\u30b8\u306e\u5fa9\u5143\r\ngit reset HEAD <\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u540d> #\u30b9\u30c6\u30fc\u30b8\u306e\u5fa9\u5143\r\ngit reset HEAD . #\u5168\u5909\u66f4\u3092\u53d6\u308a\u6d88\u3059\r\ngit commit --amend #\u76f4\u524d\u306e\u30b3\u30df\u30c3\u30c8\u3092\u3084\u308a\u76f4\u3059(push\u3057\u305f\u30b3\u30df\u30c3\u30c8\u306f\u3084\u308a\u76f4\u3057\u3066\u306f\u3044\u3051\u306a\u3044)\r\n<\/code><\/pre>\n\u30fb\u642c\u52a8<\/p>\n
\u30fb\u30d5\u30a1\u30a4\u30eb\u306e\u79fb\u52d5\r\n git mv <\u65e7\u30d5\u30a1\u30a4\u30eb>\u3000<\u65b0\u30d5\u30a1\u30a4\u30eb>\r\n \u4e0b\u8a18\u30b3\u30de\u30f3\u30c9\u3068\u540c\u3058\u5185\u5bb9\r\n mv <\u65e7\u30d5\u30a1\u30a4\u30eb>\u3000<\u65b0\u30d5\u30a1\u30a4\u30eb>\r\n\r\n git mv <\u65e7\u30d5\u30a1\u30a4\u30eb>\r\n git add\u3000<\u65b0\u30d5\u30a1\u30a4\u30eb>\r\n<\/code><\/pre>\n\u30fb\u8fdc\u7a0b\u4ed3\u5e93<\/p>\n
\u3007\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea(Github)\u3092\u8ffd\u52a0\r\n git remote add origin <\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30eaURL>\r\n\u3007\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea(Github)\u3092\u65b0\u898f\u8ffd\u52a0\r\n git remote add origin <\u30ea\u30e2\u30fc\u30c8\u540d><\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30eaURL>\r\n\r\n\u3007push\r\n git push <\u30ea\u30e2\u30fc\u30c8\u540d><\u30d6\u30e9\u30f3\u30c1\u540d>\r\n git push -u origin master #\u521d\u56de\u306e\u307f\u5b9f\u884c\u3001\u6b21\u56de\u4ee5\u964dgit push\u30b3\u30de\u30f3\u30c9\u306e\u307f\u3067push\u3067\u304d\u308b\u3088\u3046\u306b\u306a\u308b\r\n<\/code><\/pre>\n\u30fb\u5316\u540d<\/p>\n
\u3007\u30b3\u30de\u30f3\u30c9\u306b\u30a8\u30a4\u30ea\u30a2\u30b9(\u5225\u540d)\u3092\u4ed8\u3051\u308b\r\n \u2192\u6bce\u56de\u9577\u3044\u30b3\u30de\u30f3\u30c9\u3092\u5165\u529b\u3059\u308b\u306e\u304c\u9762\u5012\r\n\r\n git config --global alias.ci #ci=>commit\r\n git config --global alias.st #st=>status\r\n git config --global alias.br #br=>branch\r\n git config --global alias.co #co=>checkout\r\n\r\n --global\u3092\u4ed8\u3051\u308b\u3068PC\u5168\u30e6\u30fc\u30b6\u30fc\u306b\u53cd\u6620\r\n\r\n\u3007\u30a8\u30a4\u30ea\u30a2\u30b9\u3092\u524a\u9664\u3059\u308b\u65b9\u6cd5\r\n git config --global --unset alias.co \r\n\r\n\u3007\u30a8\u30a4\u30ea\u30a2\u30b9\u306e\u4e00\u89a7\u3092\u78ba\u8a8d\u3059\u308b\r\n git config --global\u3000--list\r\n<\/code><\/pre>\n\u5ffd\u7565<\/p>\n
\u3007\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406\u3057\u305f\u304f\u306a\u3044\u30d5\u30a1\u30a4\u30eb\u3092\u8a18\u8f09\u3057\u305f.gitignore\u30d5\u30a1\u30a4\u30eb\u3092\u4f5c\u6210\u3059\u308b\r\n.gitignore\r\n\r\n#\u304b\u3089\u59cb\u307e\u308b\u884c\u306f\u30b3\u30e1\u30f3\u30c8\u6271\u3044\r\n\u3007\u6307\u5b9a\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u3092\u9664\u5916\r\n index.html\r\n\u3007\u30eb\u30fc\u30c8\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u6307\u5b9a\r\n \/root.html\r\n\u3007\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u4ee5\u4e0b\u3092\u9664\u5916\r\n dir\/\r\n\u3007\/\u4ee5\u5916\u306e\u6587\u5b57\u5217\u306b\u30de\u30c3\u30c1[*]\r\n \/*\/*.CSS\r\n<\/code><\/pre>\n\u30fb\u8fdc\u7a0b<\/p>\n
\u3007\u30ea\u30e2\u30fc\u30c8\u60c5\u5831\u3092\u8868\u793a\u3059\u308b\r\n git remote\r\n git remote -v #\u5bfe\u5fdc\u3059\u308bURL\u3092\u8868\u793a\r\n\r\n\u3007\u30ea\u30e2\u30fc\u30c8\u304b\u3089\u60c5\u5831\u3092\u53d6\u5f97\u3059\u308b(\u30ed\u30fc\u30ab\u30eb\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u4fdd\u5b58\u3057\u3066\u304b\u3089\u3001\u500b\u4eba\u30d5\u30a1\u30a4\u30eb\u306b\u53cd\u6620)\r\n git fetch <\u30ea\u30e2\u30fc\u30c8\u540d>\r\n git fetch origin\r\n \u60c5\u5831\u306f\u30ed\u30fc\u30ab\u30eb\u30ea\u30dd\u30b8\u30c8\u30ea\u306eremote\u30d5\u30a9\u30eb\u30c0\u306b\u683c\u7d0d\u3055\u308c\u308b\u305f\u3081\u3001\u500b\u4eba\u30d5\u30a1\u30a4\u30eb\u306b\u306f\u53cd\u6620\u3055\u308c\u306a\u3044\u3002\u53cd\u6620\u3055\u305b\u308b\u30b3\u30de\u30f3\u30c9\u306f\u30de\u30fc\u30b8\u3092\u4f7f\u7528\u3059\u308b\r\n git merge \/origin\r\n\r\n\u3007\u30ea\u30e2\u30fc\u30c8\u304b\u3089\u60c5\u5831\u3092\u53d6\u5f97\u3059\u308b(\u76f4\u63a5\u3001\u500b\u4eba\u30d5\u30a1\u30a4\u30eb\u306b\u53cd\u6620)\r\n git pull<\u30ea\u30e2\u30fc\u30c8\u540d><\u30d6\u30e9\u30f3\u30c1\u540d>\r\n git pull origin master\r\n\r\n \u4e0a\u8a18\u30b3\u30de\u30f3\u30c9\u306f\u7701\u7565\u53ef\u80fd\r\n git pull\r\n\r\n \u3053\u308c\u306f\u4e0b\u8a18\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3057\u305f\u306e\u3068\u540c\u3058\u3053\u3068\r\n git fetch origin master\r\n git merge origin master\r\n\r\n\u3007pull\u3068fetch\u306e\u4f7f\u3044\u5206\u3051\r\n pull\u306f\u30ea\u30e2\u30fc\u30c8\u304b\u3089\u76f4\u63a5\u60c5\u5831\u3092\u53d6\u5f97\u3067\u304d\u308b\u306e\u3067\u697d\u3060\u304c\u3001\u6319\u52d5\u304c\u7279\u6b8a\u306a\u306e\u3067\u6163\u308c\u308b\u307e\u3067\u306f\u3001fetch\u30fbmerge\u306e\u65b9\u304c\u826f\u3044\r\n\r\n\u3007\u30ea\u30e2\u30fc\u30c8\u306e\u8a73\u7d30\u60c5\u5831\u3092\u8868\u793a\u3057\u305f\u3044\u6642\r\n git remote show <\u30ea\u30e2\u30fc\u30c8\u540d>\r\n git remote show origin\r\n\r\n\u3007\u30ea\u30e2\u30fc\u30c8\u3092\u5909\u66f4\u3059\u308b\r\n git remote rename <\u65e7\u30ea\u30e2\u30fc\u30c8\u540d><\u65b0\u30ea\u30e2\u30fc\u30c8\u540d>\r\n git remote rename turorial new_turorial\r\n\r\n\u3007\u30ea\u30e2\u30fc\u30c8\u3092\u524a\u9664\u3059\u308b\r\n git remote rm <\u30ea\u30e2\u30fc\u30c8\u540d>\r\n git remote rm new_turorial\r\n<\/code><\/pre>\n\u30fb\u5206\u652f<\/p>\n
\u3007\u30d6\u30e9\u30f3\u30c1\u3068\u306f\r\n \u5206\u5c90\u3059\u308b\u3053\u3068\u3067\u8907\u6570\u6a5f\u80fd\u3092\u540c\u6642\u4e26\u884c\u3067\u958b\u767a\u3059\u308b\u305f\u3081\u306e\u4ed5\u7d44\u307f\r\n \u30d6\u30e9\u30f3\u30c1\u3068\u306f\u30b3\u30df\u30c3\u30c8\u3092\u6307\u3059\u30dd\u30a4\u30f3\u30bf\r\n\r\n\u3007\u30d6\u30e9\u30f3\u30c1\u3092\u4f5c\u6210\u3059\u308b\u3060\u3051\u3067\u3001\u30d6\u30e9\u30f3\u30c1\u306e\u5207\u308a\u66ff\u3048\u307e\u3067\u306f\u884c\u308f\u306a\u3044\r\n git branch <\u30d6\u30e9\u30f3\u30c1\u540d>\r\n git branch feature\r\n\r\n\u3007\u30d6\u30e9\u30f3\u30c1\u306e\u4e00\u89a7\u3092\u8868\u793a\u3059\u308b\r\n git branch\r\n git branch -a #\u3059\u3079\u3066\u306e\u30d6\u30e9\u30f3\u30c1\u3092\u8868\u793a\u3059\u308b\r\n\r\n\u3007\u30d6\u30e9\u30f3\u30c1\u3092\u5207\u308a\u66ff\u3048\u308b\r\n git checkout <\u65e2\u5b58\u30d6\u30e9\u30f3\u30c1\u540d>\r\n git checkout feature\r\n\r\n\u3007\u30d6\u30e9\u30f3\u30c1\u3092\u65b0\u898f\u4f5c\u6210\u3057\u3066\u5207\u308a\u66ff\u3048\u308b\r\n git checkout -b <\u65b0\u30d6\u30e9\u30f3\u30c1\u540d>\r\n -b\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u4ed8\u3051\u308b\u3068\u30d6\u30e9\u30f3\u30c1\u306e\u4f5c\u6210\u3068\u5207\u308a\u66ff\u3048\u3092\u4e00\u5ea6\u306b\u3057\u3066\u304f\u308c\u308b\u306e\u3067\u4fbf\u5229\r\n\r\n\u3007\u30d6\u30e9\u30f3\u30c1\u3092\u5909\u66f4\u3059\u308b\r\n git branch -m <\u30d6\u30e9\u30f3\u30c1\u540d>\r\n git branch -m new_branch\u3000#\u81ea\u5206\u304c\u4f5c\u696d\u3057\u3066\u3044\u308b\u30d6\u30e9\u30f3\u30c1\u306e\u540d\u524d\u3092\u5909\u66f4\u3059\u308b\r\n\r\n\u3007\u30d6\u30e9\u30f3\u30c1\u3092\u524a\u9664\u3059\u308b\r\n git branch -d <\u30d6\u30e9\u30f3\u30c1\u540d>\r\n git branch -d feature\u3000#master\u306b\u30de\u30fc\u30b8\u3055\u308c\u3066\u3044\u306a\u3044\u5909\u66f4\u304c\u6b8b\u3063\u3066\u3044\u308b\u5834\u5408\u524a\u9664\u3057\u306a\u3044\r\n\r\n\u3007\u5f37\u5236\u524a\u9664\u3059\u308b\r\n git branch -D <\u30d6\u30e9\u30f3\u30c1\u540d> \r\n<\/code><\/pre>\n\u30fb\u5408\u5e76<\/p>\n
\u3007\u30de\u30fc\u30b8\u3068\u306f\r\n \u4ed6\u306e\u4eba\u306e\u5909\u66f4\u5185\u5bb9\u3092\u53d6\u308a\u8fbc\u3080\u4f5c\u696d\u306e\u4e8b\r\n git merge <\u30d6\u30e9\u30f3\u30c1\u540d>\r\n git merge <\u30ea\u30e2\u30fc\u30c8\u540d\/\u30d6\u30e9\u30f3\u30c1\u540d>\r\n git merge origin\/master #\u4f5c\u696d\u4e2d\u306e\u30d6\u30e9\u30f3\u30c1\u306b\u30de\u30fc\u30b8\u3059\u308b\r\n\r\n\u3007\u30de\u30fc\u30b8\u306e\u6982\u5ff5\r\n\u30de\u30fc\u30b8\u306b\u306f3\u7a2e\u985e\u3042\u308b\r\n1\u7a2e\u985e\u76ee\uff1aFast Foward\u3001\u65e9\u9001\u308a\u306b\u306a\u308b\u30de\u30fc\u30b8\r\n \u30d6\u30e9\u30f3\u30c1\u304c\u679d\u5206\u304b\u308c\u3057\u306a\u304b\u3063\u305f\u3068\u304d\u306f\u3001\u30d6\u30e9\u30f3\u30c1\u306e\u30dd\u30a4\u30f3\u30bf\u3092\u524d\u306b\u9032\u3081\u308b\u3060\u3051\r\n2\u7a2e\u985e\u76ee\uff1aAuto Merge\u3001\u57fa\u672c\u7684\u306a\u30de\u30fc\u30b8\r\n \u679d\u5206\u304b\u308c\u3057\u3066\u958b\u767a\u3057\u3066\u3044\u305f\u5834\u5408\u3001\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u3068\u3044\u3046\u65b0\u3057\u3044\u30b3\u30df\u30c3\u30c8\u3092\u4f5c\u308b\r\n3\u7a2e\u985e\u76ee\uff1a\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\r\n \u540c\u3058\u30d5\u30a1\u30a4\u30eb\u306e\u540c\u3058\u884c\u306b\u5bfe\u3057\u3066\u7570\u306a\u308b\u7de8\u96c6\u3092\u884c\u3063\u305f\u6642\u306b\u767a\u751f\r\n<\/code><\/pre>\n\u7528GitHub\u8fdb\u884c\u5f00\u53d1\u6d41\u7a0b
\nPull Request\u7684\u6d41\u7a0b
\nPull Request\u662f\u4e00\u79cd\u529f\u80fd\uff0c\u7528\u4e8e\u8bf7\u6c42\u5c06\u81ea\u5df1\u7684\u66f4\u6539\u4ee3\u7801\u5408\u5e76\u5230\u4ee3\u7801\u5e93\u4e2d
\n1. \u66f4\u65b0\u672c\u5730\u4ee3\u7801\u5e93\u7684\u4e3b\u5206\u652f\u5230\u6700\u65b0\u72b6\u6001
\n2. \u5728\u672c\u5730\u4ee3\u7801\u5e93\u521b\u5efa\u4e00\u4e2a\u65b0\u7684\u5206\u652f
\n3. \u4fee\u6539\u672c\u5730\u4ee3\u7801\u5e93\u7684\u6587\u4ef6
\n4. \u63d0\u4ea4\u66f4\u6539
\n5. \u63a8\u9001\u5230GitHub\uff08\u8fdc\u7a0b\u4ee3\u7801\u5e93\uff09
\n6. \u5728GitHub\u4e0a\u53d1\u9001Pull Request
\n7. \u8bf7\u6c42\u8fdb\u884c\u4ee3\u7801\u5ba1\u67e5
\n8. \u5408\u5e76Pull Request
\n9. \u5220\u9664\u5206\u652f
\n10. \u5c06GitHub\u4e0a\u7684\u4e3b\u5206\u652fpull\u5230\u672c\u5730\u4ee3\u7801\u5e93\uff0c\u4f7f\u5176\u8fbe\u5230\u6700\u65b0\u72b6\u6001
\n11. \u5220\u9664\u672c\u5730\u4ee3\u7801\u5e93\u7684\u5206\u652f<\/p>\n
GitHub Flow\u7684\u6d41\u7a0b
\n\u4ece\u4e3b\u5206\u652f\uff08master\uff09\u521b\u5efa\u5206\u652f
\n\u901a\u8fc7\u62c9\u53d6\u8bf7\u6c42\uff08pull request\uff09\u5c06\u5206\u652f\u5408\u5e76\u56de\u4e3b\u5206\u652f\uff08master\uff09<\/p>\n
\u30fb\u91cd\u7f6e<\/p>\n
\u3007\u30ea\u30d9\u30fc\u30b9\u3068\u306f\u3001\u5c65\u6b74\u3092\u304d\u308c\u3044\u306b\u6574\u3048\u305f\u5f62\u3067\u5909\u66f4\u3092\u7d71\u5408\u3059\u308b\r\n git rebase <\u30d6\u30e9\u30f3\u30c1\u540d>\u3000#\u30d6\u30e9\u30f3\u30c1\u306e\u57fa\u70b9\u3068\u306a\u308b\u30b3\u30df\u30c3\u30c8\u3092\u5225\u306e\u30b3\u30df\u30c3\u30c8\u306b\u79fb\u52d5\u3059\u308b\r\n\r\n\u3007\u30ea\u30d9\u30fc\u30b9\u3068\u30de\u30fc\u30b8\u306e\u9055\u3044\r\n \u5c65\u6b74\u304c\u4e00\u76f4\u7dda\u304b\u305d\u3046\u3067\u306a\u3044\u304b\r\n\r\n\u3007\u30ea\u30d9\u30fc\u30b9\u3067\u3057\u3066\u306f\u3044\u3051\u306a\u3044\u3053\u3068\r\n GitHub\u306b\u30d7\u30c3\u30b7\u30e5\u3057\u305f\u30b3\u30df\u30c3\u30c8\u3092\u30ea\u30d9\u30fc\u30b9\u3059\u308b\u306e\u306fNG\r\n git push -f \u306f\u7d76\u5bfeNG\r\n\r\n\u3007\u30de\u30fc\u30b8\u304b\u30ea\u30d9\u30fc\u30b9\u306f\u8003\u3048\u65b9\u6b21\u7b2c\r\n \u30fb\u30de\u30fc\u30b8\r\n \u30e1\u30ea\u30c3\u30c8\uff1a\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u306e\u89e3\u6c7a\u304c\u6bd4\u8f03\u7684\u7c21\u5358\r\n \u30c7\u30e1\u30ea\u30c3\u30c8\uff1a\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u304c\u305f\u304f\u3055\u3093\u3042\u308b\u3068\u5c65\u6b74\u304c\u8907\u96d1\u5316\u3059\u308b\r\n\r\n \u30fb\u30ea\u30d9\u30fc\u30b9\r\n \u30e1\u30ea\u30c3\u30c8\uff1a\u5c65\u6b74\u3092\u304d\u308c\u3044\u306b\u4fdd\u3064\u3053\u3068\u304c\u3067\u304d\u308b\r\n \u30c7\u30e1\u30ea\u30c3\u30c8\uff1a\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u306e\u89e3\u6c7a\u304c\u82e5\u5e72\u9762\u5012(\u30b3\u30df\u30c3\u30c8\u305d\u308c\u305e\u308c\u306b\u89e3\u6d88\u304c\u5fc5\u8981)\r\n\r\n\u3007\u4f7f\u3044\u5206\u3051\r\n\u4f5c\u696d\u306e\u5c65\u6b74\u3092\u6b8b\u3057\u305f\u3044\u306a\u3089\u30de\u30fc\u30b8\u3001\u5c65\u6b74\u3092\u304d\u308c\u3044\u306b\u3057\u305f\u3044\u306a\u3089\u30ea\u30d9\u30fc\u30b9\r\n<\/code><\/pre>\n\u2022 \u6807\u7b7e<\/p>\n
\u3007\u30bf\u30b0\r\n \u30b3\u30df\u30c3\u30c8\u3092\u53c2\u7167\u3057\u3084\u3059\u304f\u3059\u308b\u305f\u3081\u306b\u5206\u304b\u308a\u3084\u3059\u3044\u540d\u524d\u3092\u4ed8\u3051\u308b\u306e\u304c\u30bf\u30b0\u3002\r\n \u30ea\u30ea\u30fc\u30b9\u30dd\u30a4\u30f3\u30c8\u306b\u4f7f\u7528\u3055\u308c\u308b\u3002\r\n git tag #\u3059\u3079\u3066\u306e\u30bf\u30b0\u304c\u8868\u793a\u3055\u308c\u308b\r\n git tag -l 201705 #201705\u306b\u8a72\u5f53\u3059\u308b\u30bf\u30b0\u304c\u8868\u793a\u3055\u308c\u308b\r\n\r\n\u3007\u30bf\u30b0\u306b\u306f\u3001\u6ce8\u91c8\u4ed8\u304d\u7248(annotated)\u3068\u8efd\u91cf\u7248(lightweight)\u306e2\u7a2e\u985e\u304c\u3042\u308b\r\n \u6ce8\u91c8\u4ed8\u304d\u7248(annotated)\u3001\u60c5\u5831\u91cf\u304c\u3042\u308b\u6b63\u5f0f\u7248\u3002\r\n \u8efd\u91cf\u7248(lightweight)\u3001\u60c5\u5831\u91cf\u304c\u5c11\u306a\u3044\u7701\u7565\u5f62\u3002\r\n \u3088\u304f\u4f7f\u7528\u3055\u308c\u308b\u306e\u304c\u6ce8\u91c8\u4ed8\u304d\u7248\u3002\r\n\r\n\u3007\u6ce8\u91c8\u4ed8\u304d\u7248(annotated)\r\n git tag -a [\u30bf\u30b0\u540d] -m \"[\u30e1\u30c3\u30bb\u30fc\u30b8]\"\r\n git tag -a 20170520_01 -m \"version 20170520_01\"\r\n -a\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u4ed8\u3051\u308b\u3068\u6ce8\u91c8\u4ed8\u304d\u30bf\u30d6\u3092\u4f5c\u6210\u3002\r\n -m\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u4ed8\u3051\u308b\u3068\u30a8\u30c7\u30a3\u30bf\u3092\u7acb\u3061\u4e0a\u3052\u305a\u306b\uff92\uff6f\uff7e\uff70\uff7c\uff9e\u3092\u5165\u529b\u3067\u304d\u308b\r\n\r\n\u3007\u8efd\u91cf\u7248(lightweight)\r\n git tag [\u30bf\u30b0\u540d]\r\n git tag 20170520_01\r\n\r\n\u3007\u5f8c\u304b\u3089\u30bf\u30b0\u4ed8\u3051\u3059\u308b\r\n git tag [\u30bf\u30b0\u540d][\u30b3\u30df\u30c3\u30c8\u540d]\r\n git tag 20170520_01 8a5cbc4\r\n\r\n\u3007\u30bf\u30b0\u306e\u30c7\u30fc\u30bf\u3092\u8868\u793a\u3059\u308b\r\n git show [\u30bf\u30b0\u540d]\r\n git show 20170520_01\r\n\r\n\u3007\u30bf\u30b0\u3092\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u9001\u4fe1\u3059\u308b\r\n git push [\u30ea\u30e2\u30fc\u30c8\u540d][\u30bf\u30b0\u540d]\r\n git push origin 20170520_01\r\n\r\n git push origin --tags \r\n --tags\u3092\u4ed8\u3051\u308b\u3068\u30ed\u30fc\u30ab\u30eb\u306b\u3042\u3063\u3066\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u5b58\u5728\u3057\u306a\u3044\u30bf\u30b0\u3092\u4e00\u6589\u306b\u9001\u4fe1\u3059\u308b\u3002\r\n<\/code><\/pre>\n\u2022 \u80e1\u5b50
\n\u2022 \u805a\u5b9d\u76d2 (j\u00f9 h\u00e9)
\n\u2022 \u79c1\u7269 (s\u012b w\u00f9)
\n\u2022 \u85cf\u54c1
\n\u2022 \u79d8\u5bc6\u5b9d\u85cf<\/p>\n
\u3007\u4f5c\u696d\u304c\u9014\u4e2d\u3067\u30b3\u30df\u30c3\u30c8\u3057\u305f\u304f\u306a\u3044\u3051\u3069\u3001\u5225\u306e\u30d6\u30e9\u30f3\u30c1\u3067\u4f5c\u696d\u3057\u306a\u3044\u3068\u3044\u3051\u306a\u3044\u3002\r\n \u305d\u3046\u3044\u3046\u6642\u306b\u4f5c\u696d\u3092\u4e00\u6642\u907f\u96e3\u3059\u308b\u3002\r\n git stash (= git stash save) \r\n\r\n\u3007\u907f\u96e3\u3057\u305f\u4f5c\u696d\u3092\u78ba\u8a8d\u3059\u308b\r\n git stash list\r\n\r\n\u3007\u907f\u96e3\u3057\u305f\u5fa9\u5143\u3059\u308b\r\n git stash apply #\u6700\u65b0\u306e\u4f5c\u696d\u3092\u5fa9\u5143\u3059\u308b(\u30ef\u30fc\u30af\u306e\u307f)\r\n git stash apply --index #\u30b9\u30c6\u30fc\u30b8\u306e\u72b6\u6cc1\u3082\u5fa9\u5143\u3059\u308b\r\n\r\n\u3007\u7279\u5b9a\u306e\u4f5c\u696d\u3092\u5fa9\u5143\u3059\u308b\r\n git stash apply [\u30b9\u30bf\u30c3\u30b7\u30e5\u540d]\r\n git stash apply stash@{1}\r\n\r\n\u3007\u907f\u96e3\u3057\u305f\u4f5c\u696d\u3092\u524a\u9664\u3059\u308b\r\n git stash drop #\u6700\u65b0\u306e\u4f5c\u696d\u3092\u524a\u9664\u3059\u308b\r\n\r\n\u3007\u7279\u5b9a\u306e\u4f5c\u696d\u3092\u524a\u9664\u3059\u308b\r\n git stash drop [\u30b9\u30bf\u30c3\u30b7\u30e5\u540d]\r\n git stash drop stash@{1}\r\n\r\n\u3007\u5168\u4f5c\u696d\u3092\u524a\u9664\u3059\u308b\r\n git stash clear\r\n<\/code><\/pre>\n","protected":false},"excerpt":{"rendered":"Git\u662f\u7528\u4e8e\u6587\u4ef6\u7248\u672c\u7ba1\u7406\u7684\u5de5\u5177\u3002\u5982\u679c\u4e0d\u8fdb\u884c\u7248\u672c\u7ba1\u7406\uff0c\u5c31\u65e0\u6cd5\u77e5\u9053\u6700\u65b0\u72b6\u6001\uff0c\u4e5f\u65e0\u6cd5\u77e5\u9053\u8c01\u5728\u4f55\u65f6\u505a\u4e86\u4f55\u79cd\u66f4\u6539\u3002\u6b64\u5916\uff0c […]<\/p>\n","protected":false},"author":11,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-37150","post","type-post","status-publish","format-standard","hentry","category-uncategorized"],"yoast_head":"\n
Git\u662f\u4ec0\u4e48 - 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\u662f\u4ec0\u4e48\/\" \/>\n<meta property=\"og:locale\" content=\"zh_CN\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"Git\u662f\u4ec0\u4e48\" \/>\n<meta property=\"og:description\" content=\"Git\u662f\u7528\u4e8e\u6587\u4ef6\u7248\u672c\u7ba1\u7406\u7684\u5de5\u5177\u3002\u5982\u679c\u4e0d\u8fdb\u884c\u7248\u672c\u7ba1\u7406\uff0c\u5c31\u65e0\u6cd5\u77e5\u9053\u6700\u65b0\u72b6\u6001\uff0c\u4e5f\u65e0\u6cd5\u77e5\u9053\u8c01\u5728\u4f55\u65f6\u505a\u4e86\u4f55\u79cd\u66f4\u6539\u3002\u6b64\u5916\uff0c […]\" \/>\n<meta property=\"og:url\" content=\"https:\/\/www.silicloud.com\/zh\/blog\/git\u662f\u4ec0\u4e48\/\" \/>\n<meta property=\"og:site_name\" content=\"Blog - Silicon Cloud\" \/>\n<meta property=\"article:published_time\" content=\"2023-11-08T12:06:22+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2024-04-29T11:34:30+00:00\" \/>\n<meta name=\"author\" content=\"\u65b0, \u97f5\" \/>\n<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n<meta name=\"twitter:label1\" content=\"\u4f5c\u8005\" \/>\n\t<meta name=\"twitter:data1\" content=\"\u65b0, \u97f5\" \/>\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%e6%98%af%e4%bb%80%e4%b9%88\/\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e6%98%af%e4%bb%80%e4%b9%88\/\",\"name\":\"Git\u662f\u4ec0\u4e48 - Blog - Silicon Cloud\",\"isPartOf\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\"},\"datePublished\":\"2023-11-08T12:06:22+00:00\",\"dateModified\":\"2024-04-29T11:34:30+00:00\",\"author\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/4ba4019495123db3038fd0809e6959c9\"},\"breadcrumb\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e6%98%af%e4%bb%80%e4%b9%88\/#breadcrumb\"},\"inLanguage\":\"zh-Hans\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/www.silicloud.com\/zh\/blog\/git%e6%98%af%e4%bb%80%e4%b9%88\/\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e6%98%af%e4%bb%80%e4%b9%88\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u9996\u9875\",\"item\":\"https:\/\/www.silicloud.com\/zh\/blog\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"Git\u662f\u4ec0\u4e48\"}]},{\"@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\/4ba4019495123db3038fd0809e6959c9\",\"name\":\"\u65b0, \u97f5\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/\",\"url\":\"https:\/\/secure.gravatar.com\/avatar\/d484b6c6e4ae82e8a9efea989e1d2af46d9b6ef128101e63b18f559fca0ae627?s=96&d=mm&r=g\",\"contentUrl\":\"https:\/\/secure.gravatar.com\/avatar\/d484b6c6e4ae82e8a9efea989e1d2af46d9b6ef128101e63b18f559fca0ae627?s=96&d=mm&r=g\",\"caption\":\"\u65b0, \u97f5\"},\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/author\/yunxin\/\"},{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e6%98%af%e4%bb%80%e4%b9%88\/#local-main-organization-logo\",\"url\":\"\",\"contentUrl\":\"\",\"caption\":\"Blog - Silicon Cloud\"}]}<\/script>\n<!-- \/ Yoast SEO Premium plugin. -->","yoast_head_json":{"title":"Git\u662f\u4ec0\u4e48 - 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\u662f\u4ec0\u4e48\/","og_locale":"zh_CN","og_type":"article","og_title":"Git\u662f\u4ec0\u4e48","og_description":"Git\u662f\u7528\u4e8e\u6587\u4ef6\u7248\u672c\u7ba1\u7406\u7684\u5de5\u5177\u3002\u5982\u679c\u4e0d\u8fdb\u884c\u7248\u672c\u7ba1\u7406\uff0c\u5c31\u65e0\u6cd5\u77e5\u9053\u6700\u65b0\u72b6\u6001\uff0c\u4e5f\u65e0\u6cd5\u77e5\u9053\u8c01\u5728\u4f55\u65f6\u505a\u4e86\u4f55\u79cd\u66f4\u6539\u3002\u6b64\u5916\uff0c […]","og_url":"https:\/\/www.silicloud.com\/zh\/blog\/git\u662f\u4ec0\u4e48\/","og_site_name":"Blog - Silicon Cloud","article_published_time":"2023-11-08T12:06:22+00:00","article_modified_time":"2024-04-29T11:34:30+00:00","author":"\u65b0, \u97f5","twitter_card":"summary_large_image","twitter_misc":{"\u4f5c\u8005":"\u65b0, \u97f5","\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4":"2 \u5206"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"WebPage","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e6%98%af%e4%bb%80%e4%b9%88\/","url":"https:\/\/www.silicloud.com\/zh\/blog\/git%e6%98%af%e4%bb%80%e4%b9%88\/","name":"Git\u662f\u4ec0\u4e48 - Blog - Silicon Cloud","isPartOf":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website"},"datePublished":"2023-11-08T12:06:22+00:00","dateModified":"2024-04-29T11:34:30+00:00","author":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/4ba4019495123db3038fd0809e6959c9"},"breadcrumb":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e6%98%af%e4%bb%80%e4%b9%88\/#breadcrumb"},"inLanguage":"zh-Hans","potentialAction":[{"@type":"ReadAction","target":["https:\/\/www.silicloud.com\/zh\/blog\/git%e6%98%af%e4%bb%80%e4%b9%88\/"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e6%98%af%e4%bb%80%e4%b9%88\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u9996\u9875","item":"https:\/\/www.silicloud.com\/zh\/blog\/"},{"@type":"ListItem","position":2,"name":"Git\u662f\u4ec0\u4e48"}]},{"@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\/4ba4019495123db3038fd0809e6959c9","name":"\u65b0, \u97f5","image":{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/","url":"https:\/\/secure.gravatar.com\/avatar\/d484b6c6e4ae82e8a9efea989e1d2af46d9b6ef128101e63b18f559fca0ae627?s=96&d=mm&r=g","contentUrl":"https:\/\/secure.gravatar.com\/avatar\/d484b6c6e4ae82e8a9efea989e1d2af46d9b6ef128101e63b18f559fca0ae627?s=96&d=mm&r=g","caption":"\u65b0, \u97f5"},"url":"https:\/\/www.silicloud.com\/zh\/blog\/author\/yunxin\/"},{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e6%98%af%e4%bb%80%e4%b9%88\/#local-main-organization-logo","url":"","contentUrl":"","caption":"Blog - Silicon Cloud"}]}},"_links":{"self":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37150","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\/11"}],"replies":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/comments?post=37150"}],"version-history":[{"count":2,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37150\/revisions"}],"predecessor-version":[{"id":87221,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37150\/revisions\/87221"}],"wp:attachment":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/media?parent=37150"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/categories?post=37150"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/tags?post=37150"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}