linux杂谈笔记之 版本管理工具svn&git

1、svn 
 checkout
svn checkout http://120.132.69.218/svn/bicaijia-appweb-service/trunk/bicaijia-appweb_2/ ./webserver
svn log -l 2
 update
$ svn update .
 commit
$ svn commit -m "pom.xml file modify"
 delete
  $ svn delete pom.xml ;svn commit -m "delete pom.xml"
 copy branch

 merge
$ svn merge  http://120.132.69.218/svn/test/branches/webserver_v4.0.1_20170426
$svn commit -m "Merge "
 resolved
svn resolved -R 
 lock unlock
svn lock pom.xml -m "lock"
svn unlock --force pom.xml
 mkdir
$ svn mkdir -m "Create dir" http://120.132.69.218/svn/test/trunk/webserver/shy
 log
svn log -l -r --stop-on-copy
 回退
$ svn merge -r head:24 http://120.132.69.218/svn/test/trunk/webserver
$ svn commit
 文件忽略
2、git
 init
git init
 clone
git clone https://username:password@ip
 push
git push origin develop:develop
 pull
 remote
 commit
 rm
 branch
 checkout
 tag
 log
 回退
 文件忽略
 

来自 “ ITPUB博客 ” ，链接：http://blog.itpub.net/23890223/viewspace-2138083/，如需转载，请注明出处，否则将追究法律责任。

转载于:http://blog.itpub.net/23890223/viewspace-2138083/