分支管理

  1. 查看远程分支 git branch -a
  2. 查看本地分支 git branch
  3. 创建分支 git branch name
  4. 把分支推到远程库 git push orgin name
  5. 切换分支 git checkout name
  6. 删除本地分支 git branch -d name

本地项目上传到github

    1. 在github上新建一个repository
    1. 选择本地的一个目录进入,右键选择git bash here
    1. 命令:
git clone 新建仓库的url
    1. 完成3后,在目录下就会多一个仓库名的文件夹,将需要上传的项目的所有文件放到那个文件夹里
    1. cd 仓库的文件夹名
    1. 输入命令
git add .
git commit -m "提交的信息"
git push -u origin master

    1. 需要github输入用户名和密码

提交修改的代码到新建分支(原来的分支代码不变)

  1. git checkout -b newbrabch

  2. git checkout oldbranch

  3. git fetch origin

  4. git reset --hard origin/oldbranch

暂时保存和恢复进度

正在dev分支开发新功能,做到一半时有人过来反馈一个bug,让马上解决,但是新功能做到了一半你又不想提交,这时就可以使用git stash命令先把当前进度保存起来,然后切换到另一个分支去修改bug,修改完提交后,再切回dev分支,使用git stash pop来恢复之前的进度继续开发新功能。

  1. git stash save 'msg'

git stash list

%23%23%20%E5%88%86%E6%94%AF%E7%AE%A1%E7%90%86%0A1.%20%E6%9F%A5%E7%9C%8B%E8%BF%9C%E7%A8%8B%E5%88%86%E6%94%AF%20%20%60git%20branch%20-a%60%0A2.%20%E6%9F%A5%E7%9C%8B%E6%9C%AC%E5%9C%B0%E5%88%86%E6%94%AF%20%60git%20branch%60%0A3.%20%E5%88%9B%E5%BB%BA%E5%88%86%E6%94%AF%20%60git%20branch%20name%60%0A4.%20%E6%8A%8A%E5%88%86%E6%94%AF%E6%8E%A8%E5%88%B0%E8%BF%9C%E7%A8%8B%E5%BA%93%20%20%60git%20push%20orgin%20name%60%0A5.%20%E5%88%87%E6%8D%A2%E5%88%86%E6%94%AF%20%20%60git%20checkout%20name%60%0A6.%20%E5%88%A0%E9%99%A4%E6%9C%AC%E5%9C%B0%E5%88%86%E6%94%AF%20%20%60git%20branch%20-d%20name%60%0A%0A%0A%0A%0A%23%23%20%E6%9C%AC%E5%9C%B0%E9%A1%B9%E7%9B%AE%E4%B8%8A%E4%BC%A0%E5%88%B0github%0A*%201.%20%E5%9C%A8github%E4%B8%8A%E6%96%B0%E5%BB%BA%E4%B8%80%E4%B8%AArepository%0A*%202.%20%E9%80%89%E6%8B%A9%E6%9C%AC%E5%9C%B0%E7%9A%84%E4%B8%80%E4%B8%AA%E7%9B%AE%E5%BD%95%E8%BF%9B%E5%85%A5%EF%BC%8C%E5%8F%B3%E9%94%AE%E9%80%89%E6%8B%A9git%20bash%20here%0A*%203.%20%E5%91%BD%E4%BB%A4%EF%BC%9A%0A%60%60%60%0Agit%20clone%20%E6%96%B0%E5%BB%BA%E4%BB%93%E5%BA%93%E7%9A%84url%0A%60%60%60%0A*%204.%20%E5%AE%8C%E6%88%903%E5%90%8E%EF%BC%8C%E5%9C%A8%E7%9B%AE%E5%BD%95%E4%B8%8B%E5%B0%B1%E4%BC%9A%E5%A4%9A%E4%B8%80%E4%B8%AA%E4%BB%93%E5%BA%93%E5%90%8D%E7%9A%84%E6%96%87%E4%BB%B6%E5%A4%B9%EF%BC%8C%E5%B0%86%E9%9C%80%E8%A6%81%E4%B8%8A%E4%BC%A0%E7%9A%84%E9%A1%B9%E7%9B%AE%E7%9A%84%E6%89%80%E6%9C%89%E6%96%87%E4%BB%B6%E6%94%BE%E5%88%B0%E9%82%A3%E4%B8%AA%E6%96%87%E4%BB%B6%E5%A4%B9%E9%87%8C%0A*%205.%20%60cd%20%E4%BB%93%E5%BA%93%E7%9A%84%E6%96%87%E4%BB%B6%E5%A4%B9%E5%90%8D%60%0A*%206.%20%E8%BE%93%E5%85%A5%E5%91%BD%E4%BB%A4%0A%60%60%60%0Agit%20add%20.%0Agit%20commit%20-m%20%22%E6%8F%90%E4%BA%A4%E7%9A%84%E4%BF%A1%E6%81%AF%22%0Agit%20push%20-u%20origin%20master%0A%0A%60%60%60%0A*%207.%20%E9%9C%80%E8%A6%81github%E8%BE%93%E5%85%A5%E7%94%A8%E6%88%B7%E5%90%8D%E5%92%8C%E5%AF%86%E7%A0%81%0A%0A%0A%0A%23%23%20%E6%8F%90%E4%BA%A4%E4%BF%AE%E6%94%B9%E7%9A%84%E4%BB%A3%E7%A0%81%E5%88%B0%E6%96%B0%E5%BB%BA%E5%88%86%E6%94%AF%EF%BC%88%E5%8E%9F%E6%9D%A5%E7%9A%84%E5%88%86%E6%94%AF%E4%BB%A3%E7%A0%81%E4%B8%8D%E5%8F%98%EF%BC%89%0A1.%20git%20checkout%20-b%20newbrabch%0A%0A2.%20git%20checkout%20oldbranch%0A%0A3.%20git%20fetch%20origin%0A%0A4.%20git%20reset%20--hard%20origin%2Foldbranch%0A%0A%23%23%20%E6%9A%82%E6%97%B6%E4%BF%9D%E5%AD%98%E5%92%8C%E6%81%A2%E5%A4%8D%E8%BF%9B%E5%BA%A6%0A%E6%AD%A3%E5%9C%A8dev%E5%88%86%E6%94%AF%E5%BC%80%E5%8F%91%E6%96%B0%E5%8A%9F%E8%83%BD%EF%BC%8C%E5%81%9A%E5%88%B0%E4%B8%80%E5%8D%8A%E6%97%B6%E6%9C%89%E4%BA%BA%E8%BF%87%E6%9D%A5%E5%8F%8D%E9%A6%88%E4%B8%80%E4%B8%AAbug%EF%BC%8C%E8%AE%A9%E9%A9%AC%E4%B8%8A%E8%A7%A3%E5%86%B3%EF%BC%8C%E4%BD%86%E6%98%AF%E6%96%B0%E5%8A%9F%E8%83%BD%E5%81%9A%E5%88%B0%E4%BA%86%E4%B8%80%E5%8D%8A%E4%BD%A0%E5%8F%88%E4%B8%8D%E6%83%B3%E6%8F%90%E4%BA%A4%EF%BC%8C%E8%BF%99%E6%97%B6%E5%B0%B1%E5%8F%AF%E4%BB%A5%E4%BD%BF%E7%94%A8git%20stash%E5%91%BD%E4%BB%A4%E5%85%88%E6%8A%8A%E5%BD%93%E5%89%8D%E8%BF%9B%E5%BA%A6%E4%BF%9D%E5%AD%98%E8%B5%B7%E6%9D%A5%EF%BC%8C%E7%84%B6%E5%90%8E%E5%88%87%E6%8D%A2%E5%88%B0%E5%8F%A6%E4%B8%80%E4%B8%AA%E5%88%86%E6%94%AF%E5%8E%BB%E4%BF%AE%E6%94%B9bug%EF%BC%8C%E4%BF%AE%E6%94%B9%E5%AE%8C%E6%8F%90%E4%BA%A4%E5%90%8E%EF%BC%8C%E5%86%8D%E5%88%87%E5%9B%9Edev%E5%88%86%E6%94%AF%EF%BC%8C%E4%BD%BF%E7%94%A8git%20stash%20pop%E6%9D%A5%E6%81%A2%E5%A4%8D%E4%B9%8B%E5%89%8D%E7%9A%84%E8%BF%9B%E5%BA%A6%E7%BB%A7%E7%BB%AD%E5%BC%80%E5%8F%91%E6%96%B0%E5%8A%9F%E8%83%BD%E3%80%82%0A1.%20git%20stash%20save%20'msg'%0A%0A2.%20git%20stash%20list%20%20%E6%9F%A5%E7%9C%8B