Git 7 -- 常用命令

1. 查看文件状态

包括增加、修改、删除

git status

2. 忽略某个文件及目录

在项目根目录下创建  .gitignore文件，并在文件里写入要忽略的文件与目录即可。

3. 分支1.1.0 覆盖 分支1.2.0

//1. 切换分支
(base) r123m-MacBook:java-demo r123m$ git checkout branch-1.2.0
branch 'branch-1.2.0' set up to track 'origin/branch-1.2.0'.
Switched to a new branch 'branch-1.2.0'

//2. 查看分支
(base) r123m-MacBook:java-demo r123m$ git branch
  branch-1.0.0
  branch-1.1.0
* branch-1.2.0

//3. 覆盖分支
(base) r123m-MacBook:java-demo r123m$ git reset --hard origin/branch-1.1.0
HEAD is now at 66f0ae5 修改readme

//4. 推送到服务器
(base) r123m-MacBook:java-demo r123m$ git push -f
Total 0 (delta 0), reused 0 (delta 0), pack-reused 0
remote: 
remote: Create a new pull request for 'branch-1.2.0':
remote:   http://192.168.xx.xx:80/r123m/java-demo/compare/branch-1.0.0...branch-1.2.0
remote: 
remote: . Processing 1 references
remote: Processed 1 references in total
To ssh://192.168.xx.xx:80/r123m/java-demo.git
   bbcc18f..66f0ae5  branch-1.2.0 -> branch-1.2.0

4. 全局设置

git config —global user.name  r123m
git config —global user.email 864245626@qq.com