From 4300cfbe680c7c36b8f5ff6db76da40f0c6ac663 Mon Sep 17 00:00:00 2001 From: wangjinbo <vannue@qq.com> Date: Fri, 17 Aug 2018 10:22:41 +0800 Subject: [PATCH] update --- doc/FromSVNToGit/CommenCmd.md | 16 ++++---- doc/FromSVNToGit/CreateNewRepository.md | 38 +++++++++---------- doc/FromSVNToGit/DemonstrateInCmd.md | 36 +++++++++--------- doc/FromSVNToGit/GitlabAccount.md | 18 ++++----- "\344\273\216SVN\345\210\260Git.md" | 14 +++---- ...50\347\232\204\351\205\215\347\275\256.md" | 2 +- ...71\357\274\214\346\217\220\344\272\244.md" | 10 ++--- 7 files changed, 67 insertions(+), 67 deletions(-) diff --git a/doc/FromSVNToGit/CommenCmd.md b/doc/FromSVNToGit/CommenCmd.md index c151477..8fb66a3 100644 --- a/doc/FromSVNToGit/CommenCmd.md +++ b/doc/FromSVNToGit/CommenCmd.md @@ -1,11 +1,11 @@ -<!-- START doctoc generated TOC please keep comment here to allow auto update --> -<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE --> -**Table of Contents** *generated with [DocToc](https://github.com/thlorenz/doctoc)* - -- [Git 甯哥敤鎿嶄綔鍛戒护](#git-%E5%B8%B8%E7%94%A8%E6%93%8D%E4%BD%9C%E5%91%BD%E4%BB%A4) - -<!-- END doctoc generated TOC please keep comment here to allow auto update --> - +<!-- START doctoc generated TOC please keep comment here to allow auto update --> +<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE --> +**Table of Contents** *generated with [DocToc](https://github.com/thlorenz/doctoc)* + +- [Git 甯哥敤鎿嶄綔鍛戒护](#git-%E5%B8%B8%E7%94%A8%E6%93%8D%E4%BD%9C%E5%91%BD%E4%BB%A4) + +<!-- END doctoc generated TOC please keep comment here to allow auto update --> + ## Git 甯哥敤鎿嶄綔鍛戒护 - `git init` diff --git a/doc/FromSVNToGit/CreateNewRepository.md b/doc/FromSVNToGit/CreateNewRepository.md index cf06ea3..e6abb3d 100644 --- a/doc/FromSVNToGit/CreateNewRepository.md +++ b/doc/FromSVNToGit/CreateNewRepository.md @@ -1,14 +1,14 @@ -<!-- START doctoc generated TOC please keep comment here to allow auto update --> -<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE --> -**Table of Contents** *generated with [DocToc](https://github.com/thlorenz/doctoc)* - -- [鍒涘缓鏂颁粨搴揮(#%E5%88%9B%E5%BB%BA%E6%96%B0%E4%BB%93%E5%BA%93) - - [鐧诲綍Web鍓嶇](#%E7%99%BB%E5%BD%95web%E5%89%8D%E7%AB%AF) - - [鏂板缓椤圭洰](#%E6%96%B0%E5%BB%BA%E9%A1%B9%E7%9B%AE) - - [鍒濆鍖栨湰鍦颁粨搴揮(#%E5%88%9D%E5%A7%8B%E5%8C%96%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93) - -<!-- END doctoc generated TOC please keep comment here to allow auto update --> - +<!-- START doctoc generated TOC please keep comment here to allow auto update --> +<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE --> +**Table of Contents** *generated with [DocToc](https://github.com/thlorenz/doctoc)* + +- [鍒涘缓鏂颁粨搴揮(#%E5%88%9B%E5%BB%BA%E6%96%B0%E4%BB%93%E5%BA%93) + - [鐧诲綍Web鍓嶇](#%E7%99%BB%E5%BD%95web%E5%89%8D%E7%AB%AF) + - [鏂板缓椤圭洰](#%E6%96%B0%E5%BB%BA%E9%A1%B9%E7%9B%AE) + - [鍒濆鍖栨湰鍦颁粨搴揮(#%E5%88%9D%E5%A7%8B%E5%8C%96%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93) + +<!-- END doctoc generated TOC please keep comment here to allow auto update --> + ## 鍒涘缓鏂颁粨搴� ### 鐧诲綍Web鍓嶇 @@ -84,7 +84,7 @@ git config --global core.safecrlf true #鎵撳紑瀹夊叏crlf 鐒跺悗锛屾垜浠灏哤eb鍓嶇鍒涘缓鐨勮繙绋嬩粨搴撶殑Url娣诲姞鍒版湰鍦扮殑origin鏍囪瘑涓� ```shell -git remote add origin https://civpub.vicp.net:8443/TestUse/test.git #杩欓噷鎴戜滑榛樿浣跨敤https +git remote add origin https://civgit.vicp.net:8443/TestUse/test.git #杩欓噷鎴戜滑榛樿浣跨敤https git remote #璇ュ懡浠ゆ鏌ユ湰鍦伴厤缃殑杩滅▼鏍囪瘑锛屽彲鑳藉瓨鍦ㄥ涓繙绋媢rl git remote -v #鏌ョ湅褰撳墠杩滅▼url鐨勮缁嗕俊鎭� ``` @@ -103,7 +103,7 @@ git commit -m "initial commit" #鎻愪氦鏆傚瓨鍖轰腑鐨勪慨鏀癸紝鍙屽紩鍙峰唴鐨勫唴  ```shell -git push origin master #灏嗗綋鍓嶅伐浣滅洰褰曚腑鐨勬墍鏈夋彁浜ゆ帹閫佸埌杩滅浠撳簱锛宱rigin鎸囧悜浜� https://civpub.vicp.net:8443/TestUse/test.git锛宮aster鏄柊寤轰粨搴撶殑榛樿鍒嗘敮锛屾垜浠皢浠ｇ爜鎻愪氦鍒癿aster鍒嗘敮 +git push origin master #灏嗗綋鍓嶅伐浣滅洰褰曚腑鐨勬墍鏈夋彁浜ゆ帹閫佸埌杩滅浠撳簱锛宱rigin鎸囧悜浜� https://civgit.vicp.net:8443/TestUse/test.git锛宮aster鏄柊寤轰粨搴撶殑榛樿鍒嗘敮锛屾垜浠皢浠ｇ爜鎻愪氦鍒癿aster鍒嗘敮 #master 鍒嗘敮鏄粯璁ゅ彈淇濇姢鍒嗘敮锛屾墽琛宲ush鎿嶄綔闇€瑕佺敤鎴峰叿鏈夐珮浜嶥eveloper鐨勬潈闄� ``` @@ -113,7 +113,7 @@ Powershell涓畬鏁寸殑杈撳叆杈撳嚭濡備笅 PS F:\jekyllTest\mysite> git init Initialized empty Git repository in F:/jekyllTest/mysite/.git/ PS F:\jekyllTest\mysite> git remote -PS F:\jekyllTest\mysite> git remote add origin https://civpub.vicp.net:8443/TestUse/test.git +PS F:\jekyllTest\mysite> git remote add origin https://civgit.vicp.net:8443/TestUse/test.git PS F:\jekyllTest\mysite> git remote origin PS F:\jekyllTest\mysite> git add . @@ -140,10 +140,10 @@ PS F:\jekyllTest\mysite> start . PS F:\jekyllTest\mysite> git init Initialized empty Git repository in F:/jekyllTest/mysite/.git/ PS F:\jekyllTest\mysite> git remote -v -PS F:\jekyllTest\mysite> git remote add origin https://civpub.vicp.net:8443/TestUse/test.git +PS F:\jekyllTest\mysite> git remote add origin https://civgit.vicp.net:8443/TestUse/test.git PS F:\jekyllTest\mysite> git remote -v -origin https://civpub.vicp.net:8443/TestUse/test.git (fetch) -origin https://civpub.vicp.net:8443/TestUse/test.git (push) +origin https://civgit.vicp.net:8443/TestUse/test.git (fetch) +origin https://civgit.vicp.net:8443/TestUse/test.git (push) PS F:\jekyllTest\mysite> git add . PS F:\jekyllTest\mysite> git status On branch master @@ -193,9 +193,9 @@ Compressing objects: 100% (15/15), done. Writing objects: 100% (16/16), 41.37 KiB | 3.76 MiB/s, done. Total 16 (delta 0), reused 0 (delta 0) remote: GitLab: You are not allowed to push code to protected branches on this project. -To https://civpub.vicp.net:8443/TestUse/test.git +To https://civgit.vicp.net:8443/TestUse/test.git ! [remote rejected] master -> master (pre-receive hook declined) -error: failed to push some refs to 'https://civpub.vicp.net:8443/TestUse/test.git' +error: failed to push some refs to 'https://civgit.vicp.net:8443/TestUse/test.git' PS F:\jekyllTest\mysite> #鏈€鍚庤繖閲屽洜涓烘垜鐢╳angjinbo杩欎釜鐢ㄦ埛鎵ц鐨刾ush鍒癿aster鍒嗘敮鐨勬搷浣滐紝wangjinbo鍦╰est缁勭殑鏉冮檺鏄痙eveloper锛宒eveloper涓嶅厑璁稿悜master鎺ㄩ€佹彁浜� ``` diff --git a/doc/FromSVNToGit/DemonstrateInCmd.md b/doc/FromSVNToGit/DemonstrateInCmd.md index 7317dcb..14c8436 100644 --- a/doc/FromSVNToGit/DemonstrateInCmd.md +++ b/doc/FromSVNToGit/DemonstrateInCmd.md @@ -1,20 +1,20 @@ -<!-- START doctoc generated TOC please keep comment here to allow auto update --> -<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE --> -**Table of Contents** *generated with [DocToc](https://github.com/thlorenz/doctoc)* - -- [鍛戒护琛屾紨绀哄父鐢ㄦ搷浣淽(#%E5%91%BD%E4%BB%A4%E8%A1%8C%E6%BC%94%E7%A4%BA%E5%B8%B8%E7%94%A8%E6%93%8D%E4%BD%9C) - - [git clone - 杩滅▼浠撳簱](#git-clone---%E8%BF%9C%E7%A8%8B%E4%BB%93%E5%BA%93) - - [淇敼鏂囨。](#%E4%BF%AE%E6%94%B9%E6%96%87%E6%A1%A3) - - [git add - 娣诲姞淇敼鍒版殏瀛樺尯](#git-add---%E6%B7%BB%E5%8A%A0%E4%BF%AE%E6%94%B9%E5%88%B0%E6%9A%82%E5%AD%98%E5%8C%BA) - - [git commit - 鎻愪氦鏆傚瓨鍖哄湴淇敼](#git-commit---%E6%8F%90%E4%BA%A4%E6%9A%82%E5%AD%98%E5%8C%BA%E5%9C%B0%E4%BF%AE%E6%94%B9) - - [git fetch - 鎷夊彇杩滅▼鍒嗘敮鏁版嵁鍒版湰鍦癩(#git-fetch---%E6%8B%89%E5%8F%96%E8%BF%9C%E7%A8%8B%E5%88%86%E6%94%AF%E6%95%B0%E6%8D%AE%E5%88%B0%E6%9C%AC%E5%9C%B0) - - [git pull - 鍙栧洖骞跺悎骞惰繙绋嬩富鏈烘煇涓垎鏀殑鏇存柊鍒版湰鍦癩(#git-pull---%E5%8F%96%E5%9B%9E%E5%B9%B6%E5%90%88%E5%B9%B6%E8%BF%9C%E7%A8%8B%E4%B8%BB%E6%9C%BA%E6%9F%90%E4%B8%AA%E5%88%86%E6%94%AF%E7%9A%84%E6%9B%B4%E6%96%B0%E5%88%B0%E6%9C%AC%E5%9C%B0) - - [楂樼骇鐗规€(#%E9%AB%98%E7%BA%A7%E7%89%B9%E6%80%A7) - - [git push - 鎺ㄩ€佹湰鍦版彁浜ゅ埌杩滅▼鍒嗘敮](#git-push---%E6%8E%A8%E9%80%81%E6%9C%AC%E5%9C%B0%E6%8F%90%E4%BA%A4%E5%88%B0%E8%BF%9C%E7%A8%8B%E5%88%86%E6%94%AF) -- [](#) - -<!-- END doctoc generated TOC please keep comment here to allow auto update --> - +<!-- START doctoc generated TOC please keep comment here to allow auto update --> +<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE --> +**Table of Contents** *generated with [DocToc](https://github.com/thlorenz/doctoc)* + +- [鍛戒护琛屾紨绀哄父鐢ㄦ搷浣淽(#%E5%91%BD%E4%BB%A4%E8%A1%8C%E6%BC%94%E7%A4%BA%E5%B8%B8%E7%94%A8%E6%93%8D%E4%BD%9C) + - [git clone - 杩滅▼浠撳簱](#git-clone---%E8%BF%9C%E7%A8%8B%E4%BB%93%E5%BA%93) + - [淇敼鏂囨。](#%E4%BF%AE%E6%94%B9%E6%96%87%E6%A1%A3) + - [git add - 娣诲姞淇敼鍒版殏瀛樺尯](#git-add---%E6%B7%BB%E5%8A%A0%E4%BF%AE%E6%94%B9%E5%88%B0%E6%9A%82%E5%AD%98%E5%8C%BA) + - [git commit - 鎻愪氦鏆傚瓨鍖哄湴淇敼](#git-commit---%E6%8F%90%E4%BA%A4%E6%9A%82%E5%AD%98%E5%8C%BA%E5%9C%B0%E4%BF%AE%E6%94%B9) + - [git fetch - 鎷夊彇杩滅▼鍒嗘敮鏁版嵁鍒版湰鍦癩(#git-fetch---%E6%8B%89%E5%8F%96%E8%BF%9C%E7%A8%8B%E5%88%86%E6%94%AF%E6%95%B0%E6%8D%AE%E5%88%B0%E6%9C%AC%E5%9C%B0) + - [git pull - 鍙栧洖骞跺悎骞惰繙绋嬩富鏈烘煇涓垎鏀殑鏇存柊鍒版湰鍦癩(#git-pull---%E5%8F%96%E5%9B%9E%E5%B9%B6%E5%90%88%E5%B9%B6%E8%BF%9C%E7%A8%8B%E4%B8%BB%E6%9C%BA%E6%9F%90%E4%B8%AA%E5%88%86%E6%94%AF%E7%9A%84%E6%9B%B4%E6%96%B0%E5%88%B0%E6%9C%AC%E5%9C%B0) + - [楂樼骇鐗规€(#%E9%AB%98%E7%BA%A7%E7%89%B9%E6%80%A7) + - [git push - 鎺ㄩ€佹湰鍦版彁浜ゅ埌杩滅▼鍒嗘敮](#git-push---%E6%8E%A8%E9%80%81%E6%9C%AC%E5%9C%B0%E6%8F%90%E4%BA%A4%E5%88%B0%E8%BF%9C%E7%A8%8B%E5%88%86%E6%94%AF) +- [](#) + +<!-- END doctoc generated TOC please keep comment here to allow auto update --> + ## 鍛戒护琛屾紨绀哄父鐢ㄦ搷浣� ### git clone - 杩滅▼浠撳簱 @@ -23,7 +23,7 @@ ```shell cd /d E:\Codes\City #鎴戜滑鍏堢敤CMD鍛戒护琛岀殑CD鍛戒护瀵艰埅鍒版垜浠範鎯瓨鏀句唬鐮佺殑璺緞涓� -git clone https://civpub.vicp.net:8443/TestUse/test.git CityTest #clone杩滅▼浠撳簱 +git clone https://civgit.vicp.net:8443/TestUse/test.git CityTest #clone杩滅▼浠撳簱 ```  diff --git a/doc/FromSVNToGit/GitlabAccount.md b/doc/FromSVNToGit/GitlabAccount.md index c3cb1b6..6e5790a 100644 --- a/doc/FromSVNToGit/GitlabAccount.md +++ b/doc/FromSVNToGit/GitlabAccount.md @@ -1,14 +1,14 @@ -<!-- START doctoc generated TOC please keep comment here to allow auto update --> -<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE --> -**Table of Contents** *generated with [DocToc](https://github.com/thlorenz/doctoc)* - -- [Git 璐﹀彿](#git-%E8%B4%A6%E5%8F%B7) - -<!-- END doctoc generated TOC please keep comment here to allow auto update --> - +<!-- START doctoc generated TOC please keep comment here to allow auto update --> +<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE --> +**Table of Contents** *generated with [DocToc](https://github.com/thlorenz/doctoc)* + +- [Git 璐﹀彿](#git-%E8%B4%A6%E5%8F%B7) + +<!-- END doctoc generated TOC please keep comment here to allow auto update --> + ## Git 璐﹀彿 -GitlabServer: http://civpub.vicp.net:8880 +GitlabServer: http://civgit.vicp.net:8880 鎺ㄨ崘鐨勪袱澶勫涔犺祫婧� diff --git "a/\344\273\216SVN\345\210\260Git.md" "b/\344\273\216SVN\345\210\260Git.md" index c1c799b..a0a2b3e 100644 --- "a/\344\273\216SVN\345\210\260Git.md" +++ "b/\344\273\216SVN\345\210\260Git.md" @@ -2,11 +2,11 @@ edit-by锛氱帇杩涙尝 2018.08 -- [瀹夎Git-Windows](https://civpub.vicp.net:8443/wangjinbo/Svn-to-Git/blob/master/doc/FromSVNToGit/InstallGitWindows.md) -- [瀹夎TotoiseGit](https://civpub.vicp.net:8443/wangjinbo/Svn-to-Git/blob/master/doc/FromSVNToGit/InstallTotoiseGit.md) -- [Git 甯哥敤鎿嶄綔鍛戒护](https://civpub.vicp.net:8443/wangjinbo/Svn-to-Git/blob/master/doc/FromSVNToGit/CommenCmd.md) -- [Git 璐﹀彿涓庡涔犺祫鏂橾(https://civpub.vicp.net:8443/wangjinbo/Svn-to-Git/blob/master/doc/FromSVNToGit/GitlabAccount.md) -- [鍒涘缓鏂颁粨搴揮(https://civpub.vicp.net:8443/wangjinbo/Svn-to-Git/blob/master/doc/FromSVNToGit/CreateNewRepository.md) -- [鍛戒护琛屾紨绀哄父鐢ㄦ搷浣淽(https://civpub.vicp.net:8443/wangjinbo/Svn-to-Git/blob/master/doc/FromSVNToGit/DemonstrateInCmd.md) -- [鍥惧舰鐣岄潰鐨凣it - SourceTree](https://civpub.vicp.net:8443/wangjinbo/Svn-to-Git/blob/master/doc/FromSVNToGit/DemonstrateInSourceTree.md) +- [瀹夎Git-Windows](https://civgit.vicp.net:8443/wangjinbo/Svn-to-Git/blob/master/doc/FromSVNToGit/InstallGitWindows.md) +- [瀹夎TotoiseGit](https://civgit.vicp.net:8443/wangjinbo/Svn-to-Git/blob/master/doc/FromSVNToGit/InstallTotoiseGit.md) +- [Git 甯哥敤鎿嶄綔鍛戒护](https://civgit.vicp.net:8443/wangjinbo/Svn-to-Git/blob/master/doc/FromSVNToGit/CommenCmd.md) +- [Git 璐﹀彿涓庡涔犺祫鏂橾(https://civgit.vicp.net:8443/wangjinbo/Svn-to-Git/blob/master/doc/FromSVNToGit/GitlabAccount.md) +- [鍒涘缓鏂颁粨搴揮(https://civgit.vicp.net:8443/wangjinbo/Svn-to-Git/blob/master/doc/FromSVNToGit/CreateNewRepository.md) +- [鍛戒护琛屾紨绀哄父鐢ㄦ搷浣淽(https://civgit.vicp.net:8443/wangjinbo/Svn-to-Git/blob/master/doc/FromSVNToGit/DemonstrateInCmd.md) +- [鍥惧舰鐣岄潰鐨凣it - SourceTree](https://civgit.vicp.net:8443/wangjinbo/Svn-to-Git/blob/master/doc/FromSVNToGit/DemonstrateInSourceTree.md) diff --git "a/\345\205\263\344\272\21612.1\346\234\215\345\212\241\345\231\250\347\232\204\351\205\215\347\275\256.md" "b/\345\205\263\344\272\21612.1\346\234\215\345\212\241\345\231\250\347\232\204\351\205\215\347\275\256.md" index ca651d0..ff821a9 100644 --- "a/\345\205\263\344\272\21612.1\346\234\215\345\212\241\345\231\250\347\232\204\351\205\215\347\275\256.md" +++ "b/\345\205\263\344\272\21612.1\346\234\215\345\212\241\345\231\250\347\232\204\351\205\215\347\275\256.md" @@ -188,7 +188,7 @@ Zabbix鐩戞帶鏈嶅姟鏈変竴涓彲閰嶇疆鐨刉eb鍓嶇锛屽彂甯冨湪http://192.168.12.1: ### 鐩戞帶妯℃澘 -鐩戞帶妯℃澘鍙互瀵煎叆瀵煎嚭锛屾垜瀵煎嚭鐨勬ā鏉挎枃浠跺湪 [杩欓噷](https://civpub.vicp.net:8443/wangjinbo/Svn-to-Git/blob/master/%E5%B7%A5%E5%85%B7/zbx_export_templates.xml)銆� 涓嬭浇鍚庡湪瀵煎叆鐣岄潰瀵煎叆鍗冲彲锛屽鍏ユ垚鍔熷悗杩橀渶瑕佸鍔犱竴椤圭洃鎺ч」鍘熷瀷銆� +鐩戞帶妯℃澘鍙互瀵煎叆瀵煎嚭锛屾垜瀵煎嚭鐨勬ā鏉挎枃浠跺湪 [杩欓噷](https://civgit.vicp.net:8443/wangjinbo/Svn-to-Git/blob/master/%E5%B7%A5%E5%85%B7/zbx_export_templates.xml)銆� 涓嬭浇鍚庡湪瀵煎叆鐣岄潰瀵煎叆鍗冲彲锛屽鍏ユ垚鍔熷悗杩橀渶瑕佸鍔犱竴椤圭洃鎺ч」鍘熷瀷銆� Configuration - Template - Template OS Windows Wohi - Discovery roles - Network interface discovery - item prototypes锛屽鍥� diff --git "a/\347\255\276\345\207\272\346\255\243\345\274\217\345\274\200\345\217\221\344\273\243\347\240\201\357\274\214\344\277\256\346\224\271\357\274\214\346\217\220\344\272\244.md" "b/\347\255\276\345\207\272\346\255\243\345\274\217\345\274\200\345\217\221\344\273\243\347\240\201\357\274\214\344\277\256\346\224\271\357\274\214\346\217\220\344\272\244.md" index 387c1a1..69cc93a 100644 --- "a/\347\255\276\345\207\272\346\255\243\345\274\217\345\274\200\345\217\221\344\273\243\347\240\201\357\274\214\344\277\256\346\224\271\357\274\214\346\217\220\344\272\244.md" +++ "b/\347\255\276\345\207\272\346\255\243\345\274\217\345\274\200\345\217\221\344\273\243\347\240\201\357\274\214\344\277\256\346\224\271\357\274\214\346\217\220\344\272\244.md" @@ -21,7 +21,7 @@ edit-by锛氱帇杩涙尝 2018.08.06 ## 妫€鏌ユ柊澧炲垎缁勫拰浠ｇ爜 -鎵撳紑Gitlab缃戦〉锛歨ttp://civpub.vicp.net:8880 杩涘叆CivDevelop鍒嗙粍 +鎵撳紑Gitlab缃戦〉锛歨ttp://civgit.vicp.net:8880 杩涘叆CivDevelop鍒嗙粍 ## 绛惧嚭CityWebService鍜學eb4 @@ -33,7 +33,7 @@ edit-by锛氱帇杩涙尝 2018.08.06 妫€鍑篊ityWebService鍚庣浠ｇ爜 ```shell -git clone -b develop https://civpub.vicp.net:8443/CivDevelope/CityWebService.git #妫€鍑篸evelop鍒嗘敮 +git clone -b develop https://civgit.vicp.net:8443/CivDevelope/CityWebService.git #妫€鍑篸evelop鍒嗘敮 cd CityWebService git branch #鏌ョ湅鏈湴褰撳墠鍒嗘敮锛屾槸develop git branch -a #鏌ョ湅鏈湴鍜岃繙绋嬬殑鍏ㄩ儴鍒嗘敮 @@ -42,7 +42,7 @@ git branch -a #鏌ョ湅鏈湴鍜岃繙绋嬬殑鍏ㄩ儴鍒嗘敮 妫€鍑篧eb4鍓嶇浠ｇ爜 ```shell -git clone -b develop https://civpub.vicp.net:8443/CivDevelope/Web4.git +git clone -b develop https://civgit.vicp.net:8443/CivDevelope/Web4.git cd Web4 git branch git branch -a @@ -74,9 +74,9 @@ git branch #妫€鏌ュ綋鍓嶆墍鍦ㄥ垎鏀� ## 鍚屾淇敼 -鐢╗BeyondCompare](https://civpub.vicp.net:8443/wangjinbo/Svn-to-Git/blob/master/%E5%B7%A5%E5%85%B7/Beyond%20CompareHA.7z)宸ュ叿瀵规瘮鑷繁鏈湴浠ｇ爜鍜屼粠Gitlab clone涓嬫潵鐨勪唬鐮侊紝灏嗘湰鏈虹殑鏀瑰姩鎵嬪姩鏇存柊鍒版湰鍦癎it working copy +鐢╗BeyondCompare](https://civgit.vicp.net:8443/wangjinbo/Svn-to-Git/blob/master/%E5%B7%A5%E5%85%B7/Beyond%20CompareHA.7z)宸ュ叿瀵规瘮鑷繁鏈湴浠ｇ爜鍜屼粠Gitlab clone涓嬫潵鐨勪唬鐮侊紝灏嗘湰鏈虹殑鏀瑰姩鎵嬪姩鏇存柊鍒版湰鍦癎it working copy -BeyondCompare宸ュ叿鎴戝湪鏈」鐩殑宸ュ叿鏂囦欢澶逛腑涓婁紶浜嗭紝闇€瑕佺殑鍙互鑷繁[涓嬭浇](https://civpub.vicp.net:8443/wangjinbo/Svn-to-Git/blob/master/%E5%B7%A5%E5%85%B7/Beyond%20CompareHA.7z)锛屾垨鑰呭幓缃戜笂鎵� +BeyondCompare宸ュ叿鎴戝湪鏈」鐩殑宸ュ叿鏂囦欢澶逛腑涓婁紶浜嗭紝闇€瑕佺殑鍙互鑷繁[涓嬭浇](https://civgit.vicp.net:8443/wangjinbo/Svn-to-Git/blob/master/%E5%B7%A5%E5%85%B7/Beyond%20CompareHA.7z)锛屾垨鑰呭幓缃戜笂鎵� > 鍦ㄨ繖姝ユ搷浣滆繃绋嬩腑锛屾垜浠紭鍏堝悓姝ヨ嚜宸变慨鏀圭殑浠ｇ爜閮ㄥ垎锛屽浜庝唬鐮佸唴瀹瑰瓨鍦ㄥ樊寮傜殑锛屽鏋滄槸鎴戜滑鑷繁鏀圭殑锛岃兘澶熷垽鏂摢杈规渶鏂帮紝灏卞彲浠ユ墜鍔ㄥ悓姝ワ紝濡傛灉涓嶆槸鎴戜滑淇敼鐨勶紝涓嶈兘鍒ゆ柇鐨勬儏鍐典笅锛屼繚鐣欏師鏍凤紝涓嶅仛淇敼锛屼互Git鐩綍涓哄噯灏卞彲浠ヤ簡 -- 2.17.1