{"id":1178,"date":"2020-07-19T22:06:42","date_gmt":"2020-07-19T14:06:42","guid":{"rendered":"https:\/\/www.siediyer.cn\/?p=1178"},"modified":"2020-07-19T22:06:42","modified_gmt":"2020-07-19T14:06:42","slug":"git%e7%a0%81%e4%ba%91%e6%93%8d%e4%bd%9c","status":"publish","type":"post","link":"https:\/\/www.siediyer.cn\/?p=1178","title":{"rendered":"Git\u7801\u4e91\u64cd\u4f5c"},"content":{"rendered":"

git\u662f\u4e00\u4e2a\u975e\u5e38\u597d\u7528\u7684\u5206\u5e03\u5f0f\u7248\u672c\u7ba1\u7406\u5de5\u5177\uff0c\u529f\u80fd\u6bd4svn\u5f3a\u5927\uff0c\u4e0eSVN\u4e0d\u540c\u70b9\u662fGit\u53bb\u4e2d\u5fc3\u5316\uff0c\u6bcf\u4e00\u4e2a\u5206\u652f\u90fd\u662f\u4e00\u4e2a\u4e2d\u5fc3\uff0c\u5e76\u4e14\u652f\u6301\u672c\u5730\u4ed3\u5e93\u5b58\u50a8\uff0c\u50cf\u5982\u4eca\u5f88\u591a\u5927\u516c\u53f8\u90fd\u7528git\u505a\u7248\u672c\u63a7\u5236\u3002\u8bdd\u4e0d\u591a\u8bf4\uff0c\u5177\u4f53\u547d\u4ee4\u6574\u7406\u5982\u4e0b\uff1a<\/p>\n

git\u62c9\u53d6\u8fdc\u7a0b\u4ee3\u7801<\/p>\n

git clone  https:\/\/xxx.git<\/pre>\n
git\u62c9\u53d6\u8fdc\u7a0b\u6307\u5b9a\u5206\u652f\u4e0b\u4ee3\u7801\uff08-b\u00a0 \u5206\u652f\u540d\u79f0\uff09<\/p>\n
git clone -b v2.8.1 https:\/\/xxx.git<\/pre>\n
\u521d\u59cb\u5316\u4e00\u4e2a\u672c\u5730\u4ed3\u5e93\uff0c\u5728\u540c\u7ea7\u76ee\u5f55\u4e0b\u4f1a\u51fa\u73b0\u4e00\u4e2a\u9690\u85cf\u7684.git\u6587\u4ef6<\/p>\n
git init<\/pre>\n
\u67e5\u770bgit\u7684\u914d\u7f6e\u4fe1\u606f<\/p>\n
git config -l<\/pre>\n
git\u914d\u7f6e\u672c\u5730\u4ed3\u5e93\u7684userName\uff08\u5fc5\u987b\uff09<\/p>\n
git config user.name 'Lee'<\/pre>\n
git\u914d\u7f6e\u672c\u5730\u4ed3\u5e93\u7684\u90ae\u7bb1\uff08\u5fc5\u987b\uff09<\/p>\n
git config user.email '12345@qq.com'<\/pre>\n
\u4e09\u7ea7\u6587\u4ef6\u914d\u7f6e\u8def\u5f84\uff1a<\/p>\n
 .git\/config \r\n\/.gitconfig    #\u5f53\u524d\u7528\u6237\u76ee\u5f55 \r\n\/etc\/gitconfig  #git\u5b89\u88c5\u76ee\u5f55<\/pre>\n
\u672c\u5730\u63d0\u4ea4\u5230git\u7d22\u5f15\uff08\u7f13\u5b58\uff09\u4e2d<\/p>\n
git add .          #\u628a\u65b0\u589e\u7684\u3001\u4fee\u6539\u7684\u90fd\u52a0\u5230\u7f13\u5b58 \r\ngit add -A        #\u628a\u65b0\u589e\u3001\u548c\u4fee\u6539\u7684\u3001\u548c\u5220\u9664\u7684\u90fd\u52a0\u5230\u7f13\u5b58<\/pre>\n
\u672c\u5730\u4ece\u7f13\u5b58\u4e2d\u52a0\u5230\u6587\u4ef6\u5e93\uff08repository\uff09\u4e2d<\/p>\n
git commit -m '\u7248\u672c\u63cf\u8ff0'  #\u63d0\u4ea4\u5230\u6587\u4ef6\u5e93<\/pre>\n
\u672c\u5730\u4e00\u4ef6\u63d0\u4ea4\u5230\u6587\u4ef6\u5e93\u4e2d<\/p>\n
git commit -am '\u7248\u672c\u63cf\u8ff0'   #\u4e00\u6b65\u5b8c\u6210\u63d0\u4ea4<\/pre>\n
\u67e5\u770b\u5f53\u524dgit\u72b6\u6001\u4fe1\u606f\uff08\u67e5\u770b\u662f\u5426\u6709\u6587\u4ef6\u672a\u63d0\u4ea4\uff09<\/p>\n
git status<\/pre>\n
git\u4e2d\u7684\u4e09\u7c7b\u6587\u4ef6<\/p>\n
\u88ab\u8ffd\u8e2a\u7684\uff08tracked\uff09:\u5df2\u7ecf\u52a0\u5165\u6587\u6863\u5e93\r\n\u4e0d\u88ab\u8ffd\u8e2a\u7684(untracked):\u6ca1\u6709\u52a0\u5165\u6587\u6863\u5e93\r\n\u5ffd\u7565\u7684(ignored):\u5ffd\u7565\u90a3\u4e9b\u4e0d\u9700\u8981\u7ba1\u7406\u7684\u6587\u4ef6\u5939\u6216\u6587\u4ef6<\/pre>\n
git\u65b0\u5efa\u5ffd\u7565\u6587\u4ef6\u00a0\u00a0\u76ee\u5f55\u4e0b\u5efa\u7acb\u4e00\u4e2a.gitignore\u6587\u4ef6(\u53ef\u4ee5\u6709\u591a\u4e2a\uff0c\u5f71\u54cd\u8303\u56f4\u5f53\u524d\u6587\u4ef6\u53ca\u5b50\u6587\u4ef6)<\/p>\n
touch .gitignore<\/pre>\n
.gitignore\u6587\u4ef6\u5ffd\u7565\u5185\u5bb9demo<\/p>\n
# Maven #\r\ntarget\/\r\n \r\n# IDEA #\r\n.idea\/\r\n*.iml\r\n \r\n# Eclipse #\r\n.settings\/\r\n.classpath\r\n.project<\/pre>\n
\u6ce8\u610f\uff1a\u65b0\u5efa\u7684\u4e00\u4e2a\u5ffd\u7565\u6587\u4ef6\uff0c\u4e3a\u4ec0\u4e48\u6ca1\u6709\u751f\u6548<\/strong><\/span><\/p>\n
\u7b54\uff1a\u53ef\u80fd\u662f\u56e0\u4e3a\u4f60\u7684\u7f13\u5b58\u533a\u5df2\u7ecf\u6709\u5ffd\u7565\u7684\u6587\u4ef6\u4e86\uff0c\u6240\u4ee5\u9700\u8981\u5148\u6e05\u7a7a\u7f13\u5b58\u533a\u91cc\u7684\u6587\u4ef6\uff0c\u91cd\u65b0add\u548ccommit\u64cd\u4f5c<\/strong><\/span><\/p>\n
\u5220\u9664\u7f13\u5b58\u533a\u6240\u6709\u6587\u4ef6\u547d\u4ee4<\/p>\n
git rm -r --cached .   #\u4e3b\u8981\u8fd9\u4e2a\u70b9\u4e00\u5b9a\u8981\u5199<\/pre>\n
\u91cd\u65b0add\u5230\u7f13\u5b58\u533a<\/p>\n
git add .<\/pre>\n
\u6bcf\u4e00\u6b21commit\u90fd\u662f\u4e00\u4e2a\u63d0\u4ea4\u70b9,\u552f\u4e00\u6807\u8bc6SHA1\u7684ID\uff0cID\u53ef\u4f7f\u7528\u524d4\u81f37\u4e2a\u6570\u5b57\u8868\u793a<\/p>\n
\u67e5\u770bgit\u7684\u65e5\u5fd7\u4fe1\u606f<\/p>\n
git log<\/pre>\n
\u7ed9\u63d0\u4ea4\u70b9\u6253\u6807\u7b7e\u00a0\u00a0git tag -a v0.2 4a80f64(\u63d0\u4ea4\u70b9SHA1\u7684ID\u7684\u524d7\u4f4d)<\/p>\n
git tag -a tagV1 d819565b     #\u63d0\u4ea4\u70b9SHA1\u7684ID\u7684\u524d7\u4f4d<\/pre>\n
\u56de\u8f66\u4e4b\u540e\u4f1a\u6709\u8f93\u5165tag\u5185\u5bb9\u7684\u754c\u9762\uff0c\u7136\u540e\u50cflinux\u4e00\u6837 \u70b9\u51fb i \u7f16\u8f91\u00a0 \u00a0\u8f93\u5165\u4fe1\u606f\u540e\u00a0 esc \u7136\u540e :wq \u4fdd\u5b58\u9000\u51fa<\/p>\n
\u7b80\u5316git\u65e5\u5fd7\u8f93\u51fa\u683c\u5f0f<\/p>\n
git log --oneline<\/pre>\n
\u663e\u793a\u4e3b\u5206\u652f\u548c\u81ea\u5206\u652fgit\u65e5\u5fd7 \uff08\u524d\u9762\u4f1a\u591a\u4e2a\u661f\u53f7\uff09<\/p>\n
git log --oneline --graph<\/pre>\n
\u67e5\u770b\u672c\u5730\u6dfb\u52a0\u4e86\u54ea\u4e9b\u8fdc\u7a0b\u5206\u652f\u5730\u5740<\/p>\n
git remote<\/pre>\n
\u67e5\u770b\u672c\u5730\u6dfb\u52a0\u4e86\u54ea\u4e9b\u8fdc\u7a0b\u5206\u652f\u5730\u5740\uff08\u8be6\u7ec6\uff09<\/p>\n
git remote -v<\/pre>\n
\u5220\u9664\u672c\u5730\u6307\u5b9a\u7684\u8fdc\u7a0b\u5730\u5740<\/p>\n
git remote remove origin<\/pre>\n
\u6dfb\u52a0\u8fdc\u7a0b\u5730\u5740<\/p>\n
git remote add origin https:\/\/xxxxxxxxxxxx.git<\/pre>\n
\u5206\u652f\uff1a\u5206\u652f\u610f\u5473\u7740\u4f60\u53ef\u4ee5\u4ece\u5f00\u53d1\u4e3b\u7ebf\uff08master\uff09\u4e0a\u5206\u79bb\u5f00\uff0c\u5728\u4e0d\u5f71\u54cd\u4e3b\u7ebf\u7684\u540c\u4e8b\u7ee7\u7eed\u5de5<\/p>\n
git branch\t                        #\u5217\u51fa\u5f53\u524d\u5f00\u53d1\u6240\u6709\u5206\u652f\uff08\u9ed8\u8ba4\u4f1a\u6709master\uff09\r\ngit branch king                   #\u521b\u5efa\u4e00\u4e2aking\u7684\u5206\u652f\uff08\u6700\u65b0\u63d0\u4ea4\u70b9\uff09\r\ngit branch king \u63d0\u4ea4\u70b9          # \u521b\u5efa\u4e00\u4e2aking\u7684\u5206\u652f\uff08\u6307\u5b9a\u63d0\u4ea4\u70b9\uff09\r\n\r\ngit branch -d -r <branchname>   # \u5220\u9664\u8fdc\u7a0b\u5206\u652f\uff0c\u5220\u9664\u540e\u8fd8\u9700\u63a8\u9001\u5230\u670d\u52a1\u5668\r\ngit push origin:<branchname>  # \u5220\u9664\u540e\u63a8\u9001\u81f3\u670d\u52a1\u5668\r\n\r\ngit branch -d king                #\u5220\u9664king\u5206\u652f\r\n \r\n \r\ngit checkout king                 #\u5207\u6362\u81f3king\u5206\u652f\r\n \r\ngit checkout master    \r\ngit merge king      #\u5408\u5e76\u5206\u652fking\u548c\u4e3b\u5e72master\uff0c\u5408\u5e76\u540e\u7684\u63d0\u4ea4\u70b9\u5c5e\u4e8e\u4e3b\u5e72master<\/pre>\n
\u672c\u5730\u5206\u652f\u91cd\u547d\u540d<\/p>\n
git branch -m <oldbranch> <newbranch> #\u91cd\u547d\u540d\u672c\u5730\u5206\u652f<\/pre>\n
\u67e5\u770b\u672c\u5730\u548c\u8fdc\u7a0b\u7684\u6240\u6709\u5206\u652f<\/p>\n
git branch -a     # \u67e5\u770b\u672c\u5730\u548c\u8fdc\u7a0b\u7684\u6240\u6709\u5206\u652f<\/pre>\n
\u67e5\u770b\u8fdc\u7a0b\u6240\u6709\u5206\u652f<\/p>\n
git branch -r # \u67e5\u770b\u8fdc\u7a0b\u6240\u6709\u5206\u652f<\/pre>\n
\u91cd\u547d\u540d\u8fdc\u7a0b\u5206\u652f\uff1a<\/p>\n
1\u3001\u5220\u9664\u8fdc\u7a0b\u5f85\u4fee\u6539\u5206\u652f
\n2\u3001push\u672c\u5730\u65b0\u5206\u652f\u5230\u8fdc\u7a0b\u670d\u52a1\u5668<\/p>\n
head\u8282\u70b9\u4ee3\u8868\u6700\u65b0\u7684commit\u00a0 \u663e\u793ahead \u4fe1\u606f<\/p>\n
git show HEAD<\/pre>\n
\u56de\u9000\uff1agit reset \u9009\u9879 \u63d0\u4ea4\u70b9(\u9009\u9879\uff1a–hard\u8868\u793a\u5168\u6062\u590d\u00a0 \u63d0\u4ea4\u70b9\uff1a\u53ef\u7528ID\u6216\u6807\u7b7e)<\/p>\n
git reset --hard v0.1<\/pre>\n
\u67e5\u8be2\u6240\u6709\u63d0\u4ea4\u70b9<\/p>\n
git reflog   #\u56de\u9000\u540e\u9700\u8981\u53cd\u6094\u7684\u8bdd\uff0c\u9700\u8981\u901a\u8fc7\u6b64\u547d\u4ee4\u67e5\u627e\u5230\u6240\u6709\u64cd\u4f5c\u7684\u63d0\u4ea4\u70b9<\/pre>\n
\u5408\u5e76\u5206\u652f\u7684\u8d77\u59cb\u70b9(\u4e0d\u63a8\u8350)<\/p>\n
git checkout master    \r\ngit rebase reking       #\u5408\u5e76\u5206\u652freking\u548c\u4e3b\u5e72master\uff0c\u5408\u5e76\u540e\u7684\u63d0\u4ea4\u70b9\u5c5e\u4e8e\u4e3b\u5e72master<\/pre>\n
clone \u514b\u9686\u8fdc\u7a0b\u6587\u4ef6<\/p>\n
git clone \"\u8fdc\u7a0b\u5730\u5740\"  \"\u672c\u5730\u6587\u4ef6\u540d\u79f0\"<\/pre>\n
push\u00a0 \u00a0\u63a8\u9001\u672c\u5730\u4fee\u6539\u5206\u652f\u81f3\u8fdc\u7a0bgit\u4ed3\u5e93<\/p>\n
git push -u origin feature-wxDemo<\/pre>\n
fetch\u4e0epull<\/p>\n
fetch\u662f\u5c06\u8fdc\u7a0b\u4e3b\u673a\u7684\u6700\u65b0\u5185\u5bb9\u62c9\u5230\u672c\u5730\uff0c\u4e0d\u8fdb\u884c\u5408\u5e76<\/p>\n
git fetch origin master<\/pre>\n
pull \u5219\u662f\u5c06\u8fdc\u7a0b\u4e3b\u673a\u7684master\u5206\u652f\u6700\u65b0\u5185\u5bb9\u62c9\u4e0b\u6765\u540e\u4e0e\u5f53\u524d\u672c\u5730\u5206\u652f\u76f4\u63a5\u5408\u5e76 fetch+merge<\/p>\n
git pull origin master<\/pre>\n
\u5982\u679c\u8fdc\u7a0b\u5206\u652f\u662f\u4e0e\u5f53\u524d\u5206\u652f\u5408\u5e76\uff0c\u5219\u5192\u53f7\u540e\u9762\u7684\u90e8\u5206\u53ef\u4ee5\u7701\u7565\u3002\u5982\u4e0b\uff1a<\/p>\n
git pull origin master:feature-wxDemo    #git pull <\u8fdc\u7a0b\u4e3b\u673a\u540d> <\u8fdc\u7a0b\u5206\u652f\u540d>:<\u672c\u5730\u5206\u652f\u540d><\/pre>\n
\u7edf\u8ba1\u6587\u4ef6\u6539\u52a8<\/p>\n
git diff --stat master origin\/master  #git diff <local branch> <remote>\/<remote branch><\/pre>\n
git\u5206\u652f\u8bf4\u660e<\/p>\n
Production\u5206\u652f\uff08\u4e3b\u7ebf\u5206\u652f\u7528\u4e8e\u53d1\u7248\uff0c\u4e0d\u4f1a\u76f4\u63a5\u6539\uff09\r\nMaster\u5206\u652f\uff0c\u8fd9\u4e2a\u5206\u652f\u53ea\u80fd\u4ece\u5176\u4ed6\u5206\u652f\u5408\u5e76\uff0c\u4e0d\u80fd\u5728\u8fd9\u4e2a\u5206\u652f\u76f4\u63a5\u4fee\u6539\r\n \r\nDevelop\u5206\u652f\uff08\u5f00\u53d1\u5206\u652f\uff09\r\n\u8fd9\u4e2a\u5206\u652f\u662f\u6211\u4eec\u662f\u6211\u4eec\u7684\u4e3b\u5f00\u53d1\u5206\u652f\uff0c\u5305\u542b\u6240\u6709\u8981\u53d1\u5e03\u5230\u4e0b\u4e00\u4e2aRelease\u7684\u4ee3\u7801\uff0c\u8fd9\u4e2a\u4e3b\u8981\u5408\u5e76\u4e0e\u5176\u4ed6\u5206\u652f\uff0c\u6bd4\u5982Feature\u5206\u652f\r\n \r\nFeature\u5206\u652f\uff08\u65b0\u529f\u80fd\u5206\u652f\uff09\r\n\u8fd9\u4e2a\u5206\u652f\u4e3b\u8981\u662f\u7528\u6765\u5f00\u53d1\u4e00\u4e2a\u65b0\u7684\u529f\u80fd\uff0c\u4e00\u65e6\u5f00\u53d1\u5b8c\u6210\uff0c\u6211\u4eec\u5408\u5e76\u56deDevelop\u5206\u652f\u8fdb\u5165\u4e0b\u4e00\u4e2aRelease \r\n \r\nRelease\u5206\u652f\uff08\u504f\u5411\u6d4b\u8bd5\uff09\r\n\u5f53\u4f60\u9700\u8981\u4e00\u4e2a\u53d1\u5e03\u4e00\u4e2a\u65b0Release\u7684\u65f6\u5019\uff0c\u6211\u4eec\u57fa\u4e8eDevelop\u5206\u652f\u521b\u5efa\u4e00\u4e2aRelease\u5206\u652f\uff0c\u5b8c\u6210Release\u540e\uff0c\u6211\u4eec\u5408\u5e76\u5230Master\u548cDevelop\u5206\u652f\r\n \r\nHotfix\u5206\u652f\uff08\u7d27\u6025bug\u53d1\u5e03\uff09\r\n\u5f53\u6211\u4eec\u5728Production\u53d1\u73b0\u65b0\u7684Bug\u65f6\u5019\uff0c\u6211\u4eec\u9700\u8981\u521b\u5efa\u4e00\u4e2aHotfix, \u5b8c\u6210Hotfix\u540e\uff0c\u6211\u4eec\u5408\u5e76\u56deMaster\u548cDevelop\u5206\u652f\uff0c\u6240\u4ee5Hotfix\u7684\u6539\u52a8\u4f1a\u8fdb\u5165\u4e0b\u4e00\u4e2aRelease<\/pre>\n
\u6bd4\u8f83\u672c\u5730\u5206\u652f\u4e0egit \u4e3b\u5206\u652f\u5dee\u5f02\u60c5\u51b5<\/p>\n
git diff --stat feature-wxAgentIm origin\/master  # git diff <local branch> <remote>\/<remote branch><\/pre>\n
git\u4e2d\u4e00\u4e9b\u9009\u9879\u89e3\u91ca\uff08\u91cd\u8981\uff09\uff1a<\/p>\n
-d\r\n--delete\uff1a\u5220\u9664\r\n \r\n-D\r\n--delete --force\u7684\u5feb\u6377\u952e\r\n \r\n-f\r\n--force\uff1a\u5f3a\u5236\r\n \r\n-m\r\n--move\uff1a\u79fb\u52a8\u6216\u91cd\u547d\u540d\r\n \r\n-M\r\n--move --force\u7684\u5feb\u6377\u952e\r\n \r\n-r\r\n--remote\uff1a\u8fdc\u7a0b\r\n \r\n-a\r\n--all\uff1a\u6240\u6709\r\n<\/pre>\n","protected":false},"excerpt":{"rendered":"
git\u662f\u4e00\u4e2a\u975e\u5e38\u597d\u7528\u7684\u5206\u5e03\u5f0f\u7248\u672c\u7ba1\u7406\u5de5\u5177\uff0c\u529f\u80fd\u6bd4svn\u5f3a\u5927\uff0c\u4e0eSVN\u4e0d\u540c\u70b9\u662fGit\u53bb\u4e2d\u5fc3\u5316\uff0c\u6bcf\u4e00\u4e2a\u5206\u652f\u90fd\u662f\u4e00\u4e2a […]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-1178","post","type-post","status-publish","format-standard","hentry","category-linux"],"_links":{"self":[{"href":"https:\/\/www.siediyer.cn\/index.php?rest_route=\/wp\/v2\/posts\/1178","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.siediyer.cn\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.siediyer.cn\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.siediyer.cn\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/www.siediyer.cn\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=1178"}],"version-history":[{"count":1,"href":"https:\/\/www.siediyer.cn\/index.php?rest_route=\/wp\/v2\/posts\/1178\/revisions"}],"predecessor-version":[{"id":1179,"href":"https:\/\/www.siediyer.cn\/index.php?rest_route=\/wp\/v2\/posts\/1178\/revisions\/1179"}],"wp:attachment":[{"href":"https:\/\/www.siediyer.cn\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=1178"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.siediyer.cn\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=1178"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.siediyer.cn\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=1178"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}