Git-查看远端分支、其他分支、删除分支版权声明

1.查看本地分支

$ git branch

• br-2.1.2.2 master

2.查看远程分支

$ git branch -r origin/HEAD -> origin/master origin/feature/IOS_visualtrack origin/feature/android_visualtrack origin/master

3.查看所有分支

$ git branch -a

• br-2.1.2.2 master remotes/origin/HEAD -> origin/master remotes/origin/br-2.1.2.1 remotes/origin/br-2.1.2.2 remotes/origin/br-2.1.3 remotes/origin/master

4.交换机远程分支

$ git branch -a

• master remotes/origin/HEAD -> origin/master remotes/origin/Release remotes/origin/master

$ git checkout -b myRelease origin/Release Branch myRelease set up to track remote branch Release from origin. Switched to a new branch myRelease

PS:作用是checkout远程的Release分支，本地命名myRelease分支并切换到本地myRelase分支

5.合并分支

合并前缩减 要并入 的分支

以下是指issue1234分支合并入master分支

$: git checkout master $: git merge issue1234 Merge made by recursive. README | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)

6.撤消上一个commit的内容(此操作将完全还原到某个版本，本地源代码也将成为上一版本的内容。)

git reset --hard

以下是撤消“update build gradle configuration file“这次commit id,返回到"add battery settings ui"这一次的commit id,

xp.chen@YC-JG-YXKF-PC27 MINGW64 /f/ob ((c8303a9...)) $ git log commit c8303a9e8db2bcf4edb7488e722a380f4e8858ec (HEAD) Author: xp.chen xp.chen@yuneec.com Date: Sat Oct 28 09:28:51 2017 +0800

update build gradle configuration file

Change-Id: I9ee532fd0d4698613698a64eb754fb98a8559e32

commit 8d8e5ccf24cf6836ab780aa3860270c3876e825a Author: xp.chen xp.chen@yuneec.com Date: Sat Oct 28 09:02:01 2017 +0800

add battery settigns ui

Change-Id: Ia907ee4e84f54c00a186d31378a7925a6adaba0e

xp.chen@YC-JG-YXKF-PC27 MINGW64 /f/ob ((c8303a9...)) $ git reset --hard 8d8e5ccf24cf6836ab780aa3860270c3876e825a HEAD is now at 8d8e5cc add battery settigns ui

xp.chen@YC-JG-YXKF-PC27 MINGW64 /f/ob ((8d8e5cc...)) $ git log commit 8d8e5ccf24cf6836ab780aa3860270c3876e825a (HEAD) Author: xp.chen xp.chen@yuneec.com Date: Sat Oct 28 09:02:01 2017 +0800

add battery settigns ui

Change-Id: Ia907ee4e84f54c00a186d31378a7925a6adaba0e

7. git commit -m 注释换行

git commit -m 注释可以用单引号括起来，例如：

$ git commit -m

1.aaaaa 2.bbbb

[master b25154b] 1.aaaaa 2.bbbb 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 ss.txt

通过git commit --amend 现在可以查看命令。log信息为

1.aaaaa 2.bbbb