git 常用笔记

=============================================================================

git pull --all

# 或
git fetch --all
就是更新所有分支。刚看了手册，原来这个--all是从所有远程仓库更新这一个分支。

我本地有develop , master,  debug 。。。这些分支都与远程仓库关联起来了。

=============================================================================

git different

vsrkong@vpc:~/Desktop/yuServer$ git diff serverSrc/worker.cpp

diff --git a/serverSrc/worker.cpp b/serverSrc/worker.cpp
index 09cc539..883d8c2 100644
--- a/serverSrc/worker.cpp
+++ b/serverSrc/worker.cpp
@@ -240,8 +240,8 @@ long long worker::htonll(long long val) {
 int worker::readn(ip::tcp::socket *sock,void *buf,size_t count) {
     size_t readlen = 0;
     while(readlen < count){
-        size_t n;
-        n=sock->receive(buffer((char*)buf+readlen,count+readlen));
+        size_t n;boost::system::error_code error;
+        n=sock->read_some(buffer((char*)buf+readlen,count+readlen),error);
         if(n <= 0){
             printf("read error:%s\n", strerror(errno));
             return -1;
@@ -255,7 +255,7 @@ int worker::writen(ip::tcp::socket *sock,void *buf, size_t count) {
     size_t writelen = 0;
     while(writelen < count) {
         size_t n;
-        n=sock->write_some(buffer((char*)buf+writelen,count-writelen));
+        n=sock->write_some(buffer((char*)buf+writelen,count-writelen),error);
         if (n <= 0) {
:...skipping...
diff --git a/serverSrc/worker.cpp b/serverSrc/worker.cpp
index 09cc539..883d8c2 100644
--- a/serverSrc/worker.cpp
+++ b/serverSrc/worker.cpp
@@ -240,8 +240,8 @@ long long worker::htonll(long long val) {
 int worker::readn(ip::tcp::socket *sock,void *buf,size_t count) {
     size_t readlen = 0;
     while(readlen < count){
-        size_t n;
-        n=sock->receive(buffer((char*)buf+readlen,count+readlen));
+        size_t n;boost::system::error_code error;
+        n=sock->read_some(buffer((char*)buf+readlen,count+readlen),error);
         if(n <= 0){
             printf("read error:%s\n", strerror(errno));
             return -1;
@@ -255,7 +255,7 @@ int worker::writen(ip::tcp::socket *sock,void *buf, size_t count) {
     size_t writelen = 0;
     while(writelen < count) {
         size_t n;
-        n=sock->write_some(buffer((char*)buf+writelen,count-writelen));
+        n=sock->write_some(buffer((char*)buf+writelen,count-writelen),error);
         if (n <= 0) {
             printf("write error:%s\n", strerror(errno));
             return -1;
~

========================================================================

git  merge 交互更新操作

test@ubuntu:~/Desktop/HomeAI$ git branch
test@ubuntu:~/Desktop/HomeAI$ git checkout -b tmp
test@ubuntu:~/Desktop/HomeAI$ git commit -a -m "1"
*** Please tell me who you are.
test@ubuntu:~/Desktop/HomeAI$ git config --global user.email "2222222222@qq.com"
test@ubuntu:~/Desktop/HomeAI$ git config --global user.name "2222222222"
test@ubuntu:~/Desktop/HomeAI$ git commit -a -m "1"
test@ubuntu:~/Desktop/HomeAI$ git checkout master
test@ubuntu:~/Desktop/HomeAI$ git pull origin master
test@ubuntu:~/Desktop/HomeAI$ git branch
* master
  tmp
test@ubuntu:~/Desktop/HomeAI$ git merge tmp 
Already up-to-date.
test@ubuntu:~/Desktop/HomeAI$ git branch -D tmp 
Deleted branch tmp (was 7976a76).
test@ubuntu:~/Desktop/HomeAI$ git branch 

* master

======================================================================================