GIT常用操作

新建仓库

1.git网页：New project datatool
2.Git init

git config --global user.name "111"
git config --global user.email "111@qq.com"

3.Create a new repository

git clone git@127.0.0.1:111/datatool.git
cd datatool
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@127.0.0.1:111/datatool.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@127.0.0.1:111/datatool.git
git push -u origin --all
git push -u origin --tags

删除仓库

git网页：setting->General->Advanced->remove project

merge fork仓库到主仓库

1.本地配置原项目的仓库地址

git remote add upstream <原仓库github地址>

2.获取原仓库的更新

git fetch upstream

3.合并原仓库的更新代码到本地的master分支上

git merge upstream/master

4.解决冲突，修改完成后使用git add完成合并
5.提交代码到主仓库

git  push origin upstream/master