实用的几个git命令

在多人使用同一个远程分支合作开发的时候，很可能出现 push 代码的时候出现以下问题

$ git push origin master

# 结果如下
To github.com:hello/demo.git
 ! [rejected]        master -> master (fetch first)
error: failed to push some refs to '[email protected]:hello/demo.git'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

很明显此时远程分支有新的 commit 未同步到本地，无法推送。正常情况下我们会执行以下操作：

$ git pull origin master

# 结果如下
remote: Counting objects: 2, done.
remote: Compressing objects: 100% (2/2), done.
remote: Total 2 (delta 1), reused 0 (delta 0)
Unpacking objects: 100% (2/2), done.
From github.com:hello/demo
   3824da0..f318a05  master     -> origin/master
Merge made by the 'recursive' strategy.
 one.md | 2 ++
 1 file changed, 2 insertions(+)
 
$ git push origin master

# 结果如下
Enumerating objects: 10, done.
Counting objects: 100% (8/8), done.
Delta compression using up to 8 threads
Compressing objects: 100% (8/8), done.
Writing objects: 100% (8/8), 1.24 KiB | 1.24 MiB/s, done.
Total 8 (delta 5), reused 0 (delta 0)
To github.com:hello/demo.git
   f318a05..1aefef1  master -> master

确实 push 成功了，但是此时用 git log 查看以下提交记录

$ git log

# 结果如下
commit 1aefef1a2bedbd3ebd82db8dcf802011a35a9888 (HEAD -> master, origin/master, origin/HEAD)
Merge: 24cfa5c f318a05
Author: hello <[email protected]>
Date:   Tue Jul 23 09:53:47 2019 +0800

    Merge branch 'master' of github.com:hello/demo

commit 24cfa5c3ad271e85ff0e64793bf2bcc9d700c233
Author: hello <[email protected]>
Date:   Tue Jul 23 09:50:06 2019 +0800

    feat: 新功能提交

commit f318a05b1a4cbc0a6cf8d7dc7d3fb99cbafb0363
Author: world <[email protected]>
Date:   Tue Jul 23 09:48:20 2019 +0800

    feat: 其他功能提交

...

你会发现多出了一条 merge commit，这个 commit 就是在执行 git pull origin master 的时候自动生成的。如果多人多次如此操作，那么提交记录就会出现很多条这种自从生成的 merge commit，非常难看。
要解决以上问题，不再出现自动生成的 merge commit，那么只要在执行 git pull origin master 的时候带上 --rebase 即可：

$ git pull --rebase origin master

$ git push origin master

修改commit注释

git commit --amend

只是commit后没有push,撤销暂存区的某些修改

git add -i

选择你要撤销的某些文件