git使用笔记

安装git之后，配置全局用户信息

$ git config --global user.name "John Doe"
$ git config --global user.email johndoe@example.com

当然，可以针对于不同的项目，可以设置不同的config信息

$ git config user.name "John Doe"
$ git config user.email johndoe@example.com

查看配置信息

如果要检查您的配置设置，可以使用该git config –list命令列出Git在此时可以找到的所有设置：

$ git config --list
user.name=John Doe
user.email=johndoe@example.com
color.status=auto
color.branch=auto
color.interactive=auto
color.diff=auto
...

移除暂存区

修改了某些文件，并且已经add到HEAD中，但是，HEAD中有一些文件不用commit，这个时候，我们可以使用git reset HEAD <file>...

把CONTRIBUTING.md从HEAD中移除

$ git reset HEAD CONTRIBUTING.md

把HEAD清空

$ git reset HEAD

---

项目中使用步骤

在项目当中，需要用到git，梳理了下使用的步骤

1.配置config
当然，这是针对于单个项目，也可以配置成--global的方式

$ git config user.name "John Doe"
$ git config user.email johndoe@example.com

2.从远程仓库拉取项目,git clone 项目git地址

$ git clone https://github.com/schacon/simplegit-progit

3.查看分支,带星号的表示当前分支

$ git branch
  dev
* feature/env_properties
  master

4.创建分支，创建一个叫做“service_dev”的分支，并切换过去

$ git checkout -b service_dev

如果要切换回到其他分支，可以使用git checkout 分支名，比如要切换到dev分支：

$ git checkout dev

如果要删除当前分支，可以使用git branch -d 分支名，比如删除service_dev

$ git branch -d service_dev

5.查看状态,可以使用git status 或者简短的模式git status -s

$ git status
On branch feature/env_properties
Changes not staged for commit:
  (use "git add/rm <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

        modified:   pom.xml
        deleted:    src/main/java/com/netease/music/controller/ExceptionController.java
        deleted:    src/main/java/com/netease/music/dto/UpdateMachineDto.java
        deleted:    src/main/java/com/netease/music/job/BeforeShutDownCallack.java
        deleted:    src/main/java/com/netease/music/job/JobContextConfig.java
        deleted:    src/main/java/com/netease/music/job/JobManager.java
        deleted:    src/main/java/com/netease/music/job/impl/TestJob.java
        deleted:    src/main/java/com/netease/music/service/exception/MongoService.java
        deleted:    src/main/java/com/netease/music/service/exception/StorageService.java
        deleted:    src/main/java/com/netease/music/service/exception/impl/MongoServiceImpl.java
        deleted:    src/main/java/com/netease/music/service/exception/impl/StorageServiceImpl.java
        deleted:    src/main/java/com/netease/music/service/job/ClusterInfoJob.java
        deleted:    src/main/java/com/netease/music/service/job/ExCountJob.java
        deleted:    src/main/java/com/netease/music/service/job/ExThresholdJob.java

no changes added to commit (use "git add" and/or "git commit -a")

简短模式

$ git status -s
 M pom.xml
 D src/main/java/com/netease/music/controller/ExceptionController.java
 D src/main/java/com/netease/music/dto/UpdateMachineDto.java
 D src/main/java/com/netease/music/job/BeforeShutDownCallack.java
 D src/main/java/com/netease/music/job/JobContextConfig.java
 D src/main/java/com/netease/music/job/JobManager.java
 D src/main/java/com/netease/music/job/impl/TestJob.java
 D src/main/java/com/netease/music/service/exception/MongoService.java
 D src/main/java/com/netease/music/service/exception/StorageService.java
 D src/main/java/com/netease/music/service/exception/impl/MongoServiceImpl.java
 D src/main/java/com/netease/music/service/exception/impl/StorageServiceImpl.java
 D src/main/java/com/netease/music/service/job/ClusterInfoJob.java
 D src/main/java/com/netease/music/service/job/ExCountJob.java
 D src/main/java/com/netease/music/service/job/ExThresholdJob.java

6.清空HEAD

修改了某些文件，并且已经add到HEAD中，但是，HEAD中有一些文件不用commit，这个时候，我们可以使用git reset HEAD <file>...

把CONTRIBUTING.md从HEAD中移除

$ git reset HEAD CONTRIBUTING.md

把HEAD清空

$ git reset HEAD

7.分段添加

#表示把所有修改过的文件都添加都HEAD中
$ git add *

#可以选择性的添加相关的文件
$ git add test.java test.properties

8.提交到本地仓库

$ git commit -m "提交信息"

9.pull分支上最新的代码,从分支service_dev 上更新最新的代码

$ git pull origin service_dev

10.push到远程分支，把本地仓库的代码提交到分支service_dev

$ git push origin service_dev