关于git的笔记

这篇文章记录了平时使用git时候遇到的问题和常用的命令。

---

gitingore里的东西又会冒出来

stackoverflow上的解释是：

Even if you haven’t tracked the files so far, git seems to be able to “know” about them even after you add them to .gitignore.

下面是解决方法

First commit your current changes, or you will lose them.
Then run the following commands from the top folder of your git repo:

git rm -r --cached .
git add .
git commit -m "fixed untracked files"

常用的分支操作

1. 查看本地分支 git branch ···· gb
2. 查看远程分支 git branch -r···· gb -r
3. 从当前分支新建一个分支 git checkout -b new_branch ···· gco -b new_branch
4. 切到一个分支 git checkout a_branch ···· gco a_branch
5. 删除本地分支(此时应该在另一个分支) git branch -D a_branch ···· gb -D a_branch
6. 删除远程分支(就是将一个空的分支推到远程分支) git push origin :a_branch ···· gp origin :a_branch
7. 将分支A合并到分支B(此时应该在分支B上执行) git merge branch_A ···· gm branch_A