git更新远程代码到本地仓库

未分类

0、一些很棒的参考资料：

• https://zlargon.gitbooks.io/git-tutorial/content/file/modify.html
• https://zhuanlan.zhihu.com/p/20175919 【附git工作逻辑】

1、从git上获取最新的代码到本地

• 查看远程仓库

$ git remote -v
origin  http://gitlab.mobvista.com/3S-Anti-Fraud/atf_query.git (fetch)
origin  http://gitlab.mobvista.com/3S-Anti-Fraud/atf_query.git (push)

• 从远程获取最新版本到本地

$ git fetch origin master
# 从远程的origin仓库的master分支下载代码到本地的origin master
remote: Counting objects: 4, done.
remote: Compressing objects: 100% (4/4), done.
remote: Total 4 (delta 3), reused 0 (delta 0)
Unpacking objects: 100% (4/4), done.
From http://gitlab.mobvista.com/3S-Anti-Fraud/atf_query
 * branch            master     -> FETCH_HEAD
   f537e20..293ac26  master     -> origin/master

• git log -p master.. origin/master

$ git log -p master.. origin/master
# 比较本地的仓库和远程参考的区别
commit 293ac26eeaed2ef5eb4a81a2ccb23393dbee62b4
Author: Ryan Fan <ryanfan0528@gmail.com>
Date:   Mon May 14 11:21:34 2018 +0800
    code optimization
diff --git a/job/huisu_new.sh b/job/huisu_new.sh
index 85c6e3c..cadae67 100644
--- a/job/huisu_new.sh
+++ b/job/huisu_new.sh
@@ -38,7 +38,7 @@ done
 END_TIME=`date "+%Y-%m-%d %H:%M:%S"`
 echo "+**************************************************+"
-echo "$datebeg ~ $dateend 的数据回溯完成!"
+echo "       $datebeg ~ $dateend 的数据回溯完成!"
 echo "+**************************************************+"
 echo "|           START TIME: $START_TIME                |"
 echo "|           END TIME  : $END_TIME                  |"

• git merge origin/master

$ git merge origin/master
# 最重要的步骤：将远程更新的代码同步到本地的Repository
Updating f537e20..293ac26
Fast-forward
 job/huisu_new.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

2、将本地最新的代码更新到git上

• git status

$ git status
# 查看有多少files发生了更改
On branch master
Your branch is up-to-date with 'origin/master'.
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)
    modified:   huisu_new.sh
no changes added to commit (use "git add" and/or "git commit -a")

• git diff

$ git diff
# 查看哪些地方发生了改变
diff --git a/job/huisu_new.sh b/job/huisu_new.sh
index cadae67..a0f3f49 100644
--- a/job/huisu_new.sh
+++ b/job/huisu_new.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
+# 获取时间参数
 if [ $# == 2 ]; then
        datebeg=$1
        dateend=$2

• git add --all

$ git add --all
# 将工作区所有发生改变的文件，提交到缓存区

• git commit -m

$ git commit -m "code optimization by git_cmd"
# 将缓存区的文件，提交到本地仓库，并加上修改message
[master 70e168f] code optimization by git_cmd
 1 file changed, 1 insertion(+)

• git push origin master:master

$ git push origin master:master
# 将本地仓库的文件，提交到远程git的指定分支
Counting objects: 4, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (4/4), done.
Writing objects: 100% (4/4), 393 bytes | 0 bytes/s, done.
Total 4 (delta 3), reused 0 (delta 0)
To http://gitlab.mobvista.com/3S-Anti-Fraud/atf_query.git
   94d6573..70e168f  master -> master