git 常用操作备忘

1. git 查看查看远程仓库分支

(demo) oliver@oliver:~/_demo/demo-app$ git remote -v
origin	https://github.com/targetoyes/book-demo.git (fetch)
origin	https://github.com/targetoyes/book-demo.git (push)
(demo) oliver@oliver:~/_demo/demo-app$ 

2. git把标签打在某个提交上

查看提交

oliver@oliver:~/src/demo$ git log
commit 7ee74a4d55c93a7a7536289e53617737b85d3c65
Author: abc <abc@xxx.yyy.com.cn>
Date:   Tue Jan 30 16:51:57 2018 +0800
    update

打标签

oliver@oliver:~/src/demo$ git tag -a "v20180130" 7ee74a4d55c93a7a7536289e53617737b85d3c65 -m "v20180130"
oliver@oliver:~/src/demo$ git push origin v20180130
Username for 'http://192.168.200.10:10080': abc
Password for 'http://abc@192.168.200.10:10080': 
对象计数中: 1, 完成.
写入对象中: 100% (1/1), 162 bytes | 0 bytes/s, 完成.
Total 1 (delta 0), reused 0 (delta 0)
To http://192.168.200.10:10080/OSP/OSP.git
 * [new tag]         v20180130 -> v20180130
oliver@oliver:~/_osp/OSP$ 

3.  查看分支

oliver@oliver:~/src/demo$ git branch
* master
oliver@oliver:~/src/demo$ git branch -a
* master
  remotes/origin/HEAD -> origin/master
  remotes/origin/develop
  remotes/origin/master

4.切换到指定的tag

oliver@oliver:~/src/demo$ git branch
* develop
  master
oliver@oliver:~/src/demo$ git checkout v20180130
Note: checking out 'v20180130'.

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by performing another checkout.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -b with the checkout command again. Example:

  git checkout -b <new-branch-name>

HEAD 目前位于 7ee74a4... update
oliver@oliver:~/_src/demo$ git brach
git：'brach' 不是一个 git 命令。参见 'git --help'。

您指的是这个么？
	branch
oliver@oliver:~/src/demo$ git branch
* （头指针分离于 v20180130）
  develop
  master

从指定tag回去

oliver@oliver:~/src/demo$ git checkout master
之前的 HEAD 位置是 7ee74a4... update
切换到分支 'master'
您的分支与上游分支 'origin/master' 一致。
oliver@oliver:~/src/demo$ git status
位于分支 master
您的分支与上游分支 'origin/master' 一致。
无文件要提交，干净的工作区
oliver@oliver:~/src/demo$ git branch
  develop
* master
oliver@oliver:~/src/demo$ 

5.本地误删除文件，从远程库拉取

# git 强行pull并覆盖本地文件
git fetch   
git reset --hard origin/master 
git pull