分支相关

1. 创建并切换分支

// 同步远程分支
$ git fetch
$ git checkout -b feature-fund-master origin/feature-fund-masterSwitched 
to a new branch 'feature-fund-master'
Branch 'feature-fund-master' set up to track remote branch 
'feature-fund-master' from 'origin'.
$ git branch -vv
* feature-fund-master             2be7ae6460 [origin/feature-fund-master] 
Merge branch 'hotfix-retry-partnerId' into 'feature-fund-master'

2. 删除本地分支

$ git branch -d bugfix-xiaoma-query
Deleted branch bugfix-xiaoma-query (was 2229636642).

3. 删除远程分支

// 方法1：注意冒号后面没有空格
$ git push origin :hotfix-retry-partnerId
 - [deleted]       hotfix-retry-partnerId
// 方法2：
$ git push origin --delete dev

代码提交

1. git add

$ git add .
$ git status
On branch branch-test
Your branch is up to date with 'origin/feature-fund-master'.

Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

        modified:  ContractTemplateQueryManager.java
        new file:  HelloWord.java

2. 撤销add操作，git reset <文件名>

$ git reset  HelloWord.java
$ git status
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

        modified:   ContractTemplateQueryManager.java

Untracked files:
  (use "git add <file>..." to include in what will be committed)

        HelloWord.java

3. git diff HEAD 查看add文件之后与本地仓库文件差别
4. git commit

$ git commit -m 'test commit 1'
[branch-test 41b3708d8f] test commit 1
 2 files changed, 9 insertions(+)
 create mode 100644 HelloWord.java

5. 查看commit内容： git show <commit_id>

$ git show 41b3708d8f

6. 撤销commit，git reset <commit_id>，可以用git log命令查询历史记录，找到想要回退到的<commit_id>；也可以用git reset HEAD^，直接回退到当前提交的上一次提交。
7. git push前一定要检查好确认commit无误，否则只能git reset <commit_id> 然后git push -f这样的危险操作来处理了。

其他操作

1. git merge，合并代码，中断merge可以用git merge --abort
2. 移花接木 git cherry-pick，可以把其他分支的某一commit单独拿过来
3. 保存当前工作空间所有commit状态前的改动：git stash，这样就可以暂停当前分支A的工作，切换到了另一分支处理其他工作，待完成后，切回分支A，git stash pop继续舞动乾坤。