Git练习

## Git练习

### 生成和配置ssh-key

生成ssh-key：		ssh-keygen -t rsa -C "注册邮箱" -b 4096
查看已经生成的ssh-key：	cat ~/.ssh/id_rsa.pub
配置ssh-key：		https://gitlab.com/profile/keys

设置完后在gitlab服务设置访问方式为SSH

### 1. 创建仓库

在站点创建 Group 和 仓库

https://gitlab.com/xxx/Tu.Utils
git@gitlab.com:xxx/Tu.Utils.git

### 2. 安装客户端并配置

git config --global user.name "Gavin.J"
git config --global user.email "xxx@xxx.com"

查看配置 git config --list

### 3. 本地创建仓库副本并提交

git init

//从远程拉取
git remote add origin git@gitlab.com:xxx/Tu.Utils.git
git@gitlab.com:xxx/Tu.Logger.git

//添加文件或者文件夹
git add Readme.md       // 指定文件夹添加
git add .		// 全部文件及文件夹添加

git commit -m "some info"
git push origin master

###  本地创建仓库并拉取

git clone git@gitlab.com:xxx/Tu.Utils.git test

git pull origin master
git pull origin work

### 本地拉取服务端仓库，并创建分支，修改代码提交

git branch work
git checkout work
//修改
git add .
git commit -m "11111"
git push origin work

### 其他进阶操作

#### branch操作

查看本地branch：git branch
查看远程branch：git branch -r
新建本地分支：git branch <branchname>
删除本地分支：git branch -d <branchname>  //在非删除分支下
切换本地分支：git checkout <branchname>
创建并切换到本地分支 ：
   git checkout -b <branchname>
 拉取远程分支并创建本地分支
   git checkout -b <branchname> origin/<branchname>
 在本地新建同名的("dev")分支，并切换到该分支
  git checkout -t origin/dev   该命令等同于：git checkout -b dev origin/dev

git remote   // 列出本地分支
git remote -a   //列出所有分支
git remote -v       // 列队远程分支对应的url
git remote add origin url      // 创建远程地址为url的分支
git remote remove xxx   //删除远程分支xxx
git remote set-url xxx url      // 将xxx的远程地址变更为url

git rm -r --cached ignore_file      //删除缓存
git rm -r --cached a/2.txt      //删除a目录下的2.txt文件 
git rm -r --cached a     // 删除a目录

git branch -D <branchname> 删除本地分支
git push --delete origin <branchname>        //删除远程分支

搜索本地Tag：git tag -l [tagname]
创建本地Tag：git tag [tagname]
创建附注标签：git tag -a [tagname] -m "注释"
提交Tag：
    git push origin [tagname] (将标签提交到git服务器)
    git push origin –tags (将本地所有标签一次性提交到git服务器)

git init   //初始化本地仓库
git clone <repository.url>  //克隆远程仓库
git clone <repository.url> "指定目录"  //克隆远程仓库到指定目录
git clone -b <branchname> <repository.url>     //通过-b <name>来指定要克隆的分支名
git pull (origin <remote branch>:<locally branch>)   //拉取远程仓库
git add <filename> & git add . & git add --all  //将文件添加到版本管理
git commit -m “注释” //提交到本地仓库
git push (origin <locally branch>:<remote branch>)  //推送到远程仓库

git status   //查看当前文件状态
git merge <branchname>   //合并分支
git diff  tmp     //版本内容对比
git log   //查看操作记录
git fetch origin master:tmp    //在本地新建一个temp分支，并将远程origin仓库的master分支代码下载到本地temp分支
git merge tmp    //合并temp分支到本地的master分支

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

$ git init
Initialized empty Git repository in D:/Gitlab/Tu.Logger/.git/
$ git remote add origin git@gitlab.com:xxx/Tu.Logger.git
$ git pull origin master
fatal: Couldn't find remote ref master /d/Gitlab/Tu.Logger (master)
$ fatal: The remote end hung up unexpectedly
git branch

404NotFound@DESKTOP-ETVDUMB MINGW64 /d/Gitlab/Tu.Logger (master)
$ git branch

404NotFound@DESKTOP-ETVDUMB MINGW64 /d/Gitlab/Tu.Logger (master)
$ git checkout -b work origin
fatal: 'origin' is not a commit and a branch 'work' cannot be created from it

404NotFound@DESKTOP-ETVDUMB MINGW64 /d/Gitlab/Tu.Logger (master)
$ git add .

404NotFound@DESKTOP-ETVDUMB MINGW64 /d/Gitlab/Tu.Logger (master)
$ git commit -m "1"
[master (root-commit) 3b09ae5] 1
 1 file changed, 1 insertion(+)
 create mode 100644 "\346\226\260\345\273\272\346\226\207\346\234\254\346\226\207\346\241\243.txt"

404NotFound@DESKTOP-ETVDUMB MINGW64 /d/Gitlab/Tu.Logger (master)
$ git push origin master
Counting objects: 3, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), 217 bytes | 217.00 KiB/s, done.
Total 3 (delta 0), reused 0 (delta 0)
To gitlab.com:xxx/Tu.Logger.git
 * [new branch]      master -> master

404NotFound@DESKTOP-ETVDUMB MINGW64 /d/Gitlab/Tu.Logger (master)
$ ^C

404NotFound@DESKTOP-ETVDUMB MINGW64 /d/Gitlab/Tu.Logger (master)
$

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

Git global setup

git config --global user.name "xxx"
git config --global user.email "xxx@xxx.com"

Create a new repository

git clone git@gitlab.com:xxx/e2e.git
cd e2e
touch README.md
git add README.md
git commit -m "add README"
git push -u origin master

Existing folder

cd existing_folder
git init
git remote add origin git@gitlab.com:xxx/e2e.git
git add .
git commit -m "Initial commit"
git push -u origin master

Existing Git repository

cd existing_repo
git remote rename origin old-origin
git remote add origin git@gitlab.com:xxx/e2e.git
git push -u origin --all
git push -u origin --tags

添加新评论