Git 的简单入手使用《二》

一时失言乱红尘 2021-10-15 18:51 332阅读 0赞

### 1.添加远程仓库，把本地仓库在远程仓库创建一个副本。 ###

（1）首先需要把一个已有的**本地仓库与远程GitHub仓库关联**，然后，才可以把本地仓库的内容推送到GitHub仓库。

# 关联本地仓库和远程仓库
    allar@Allard MINGW64 ~/Desktop/memorandum/system_design (master)
    $ git remote add origin git@github.com:AllardZhao/TinyUrl-Service.git          
    allar@Allard MINGW64 ~/Desktop/memorandum/system_design (master)
    $ git remote -v                        # 查看远程库信息，origin为远程仓库的别名
    origin  git@github.com:AllardZhao/TinyUrl-Service.git (fetch)
    origin  git@github.com:AllardZhao/TinyUrl-Service.git (push)

（2）本地 Git 仓库和 GitHub 仓库之间的传输是通过SSH加密的，所以需要配置验证信息 。使用以下命令**生成 SSH Key**

allar@Allard MINGW64 ~/Desktop/memorandum/system_design (master)
    $ ssh-keygen                     # 使用ssh-keygen一直回车直到生成秘钥完成
    
    allar@Allard MINGW64 ~/Desktop/memorandum/system_design (master)
    $ cd ~/.ssh                      # 切换到 .ssh目录
    allar@Allard MINGW64 ~/.ssh
    $ ls                             # 查看 .ssh目录下的文件
    id_rsa  id_rsa.pub               # id_rsa.pub 是公钥文件，id_rsa 私钥文件

（3） 把公钥文件的内容添加到GitHub中，登录Github上点击个人中心------》Settings------》SSH and GPG keys-------》New SSH key---------》Add SSH key。添加完成后在本地验证是否成功。

$ ssh -T git@github.com
    The authenticity of host 'github.com (13.250.177.223)' can't be established.
    RSA key fingerprint is SHA256:nThbg6kXUpJWGl7E1IGOCspRomTxdCARLviKw6E5SY8.
    Are you sure you want to continue connecting (yes/no)? yes
    Warning: Permanently added 'github.com,13.250.177.223' (RSA) to the list of known hosts.
    # 表示验证成功
    Hi AllardZhao! You've successfully authenticated, but GitHub does not provide shell access.

（4）**推送数据之前，首先需要拉取远程仓库的更新，然后才能推送本地数据到远程仓库**。使用 **git fetch \[远程仓库别名\]** 和**git merge \[远程仓库信息别名\] / \[当前分支名\]** 两个命令**拉取远程数据并合并到当前分支**。**推送本地数据到远程仓库**使用 **git push \[远程仓库别名\] \[当前分支名\]** 命令。

**     git fetch是将远程主机的最新内容拉到本地，用户在检查了以后决定是否合并到工作本机分支中。git pull 则是将远程主机的最新内容拉下来后直接合并，即：git pull = git fetch + git merge。**

allar@Allard MINGW64 ~/Desktop/memorandum/system_design (master)
    $ git config --global user.email "AllardZhao@163.com"
    allar@Allard MINGW64 ~/Desktop/memorandum/system_design (master)
    $ git config --global user.name "xiaokang"
    
    allar@Allard MINGW64 ~/Desktop/memorandum/system_design (master)
    $ git fetch origin                 # 拉取远程仓库的数据
    allar@Allard MINGW64 ~/Desktop/memorandum/system_design (master)
    $ git merge origin/master          # 将远程仓库的数据合并到当前master分支
    allar@Allard MINGW64 ~/Desktop/memorandum/system_design (master)
    $ git add .                       # 添加所有的修改到暂存区(缓存区)
    
    allar@Allard MINGW64 ~/Desktop/memorandum/system_design (master)
    $ git commit -m "V1.0"            # 提交修改到版本库
    [master d966108] V1.0
     3 files changed, 166 insertions(+)
     create mode 100644 short_url_app.py
     create mode 100644 static/css/custom.css
     create mode 100644 templates/index.html
    allar@Allard MINGW64 ~/Desktop/memorandum/system_design (master)
    $ git push origin master          # 推送本地数据到远程库仓库
    Counting objects: 8, done.
    Delta compression using up to 12 threads.
    Compressing objects: 100% (5/5), done.
    Writing objects: 100% (8/8), 2.45 KiB | 418.00 KiB/s, done.
    Total 8 (delta 0), reused 0 (delta 0)
    To github.com:AllardZhao/TinyUrl-Service.git
       8196c35..d966108  master -> master

IT-C02SD1H9FVH5:QA-pytest-base-lib xiaokang$ git pull origin master:master
    Already up to date.
    IT-C02SD1H9FVH5:QA-pytest-base-lib xiaokang$ git pull origin
    Already up to date.

### 2.克隆远程仓库到本地，将远程仓库复制一份到本地。 ###

\# 创建新分支feature并克隆远程仓库到该分支上

$ git clone git@github.com:AllardZhao/wangyinews.git  -b  feature

或者直接克隆远程仓库到本地如下：

allar@Allard MINGW64 ~/Desktop/memorandum (master)
    $ git clone git@github.com:AllardZhao/wangyinews.git    # 克隆远程仓库
    Cloning into 'wangyinews'...
    remote: Enumerating objects: 49, done.
    remote: Total 49 (delta 0), reused 0 (delta 0), pack-reused 49
    Receiving objects: 100% (49/49), 408.00 KiB | 125.00 KiB/s, done.
    Resolving deltas: 100% (4/4), done.
    
    allar@Allard MINGW64 ~/Desktop/memorandum (master)
    $ ls
    newrepo/  system_design/  wangyinews/        # 查看多了一个wangyinews目录