Git 常用命令
2013-11-01 15:32
232 查看
git log 查看
当前分支的 提交历史
--author 仅显示指定作者相关的提交。
$ git log --author=haiwang
查找 haiwang 提交的 版本;
$ git branch camera origin/camera
fatal: A branch named 'camera' already exists.
$ git branch -a
camera --> 本地的另一分支
* master --> " * " 标示了当前所在分支
remotes/origin/HEAD -> origin/master
remotes/origin/audio_dev_branch
remotes/origin/bl_test
remotes/origin/camera
remotes/origin/master
$ git branch -d camera --> 删除本地分支 camera
warning: deleting branch 'camera' that has been merged to
'refs/remotes/origin/camera', but not yet merged to HEAD.
Deleted branch camera (was 93cb3ab).
建立跟踪远程分支origin/camera的本地分支camera
$ git branch camera origin/camera
Branch camera set up to track remote branch camera from origin.
$ git checkout camera 切换到camera分支
M /cgen/apeditor/app_temp_db
M /custom/common/cgen/inc/cfg_module_default.h
M /custom/common/cgen/inc/cfg_module_file.h
Switched to branch 'camera'
$ git branch -a
* camera
master
remotes/origin/HEAD -> origin/master
remotes/origin/audio_dev_branch
remotes/origin/bl_test
remotes/origin/camera
remotes/origin/master
git branch
git branch 不带参数:列出本地已经存在的分支,并且在当前分支的前面加“*”号标记,例如:
#git branch
* master
newbranch
git branch -r 列出远程分支,例如:
#git branch -r
m/master -> origin_apps/m1_2.3.4
origin_apps/hardware/test
origin_apps/m1
origin_apps/m1_2.3.4
origin_apps/master
git branch -a 列出本地分支和远程分支,例如:
#git branch -a
* master
newbranch
remotes/m/master -> origin_apps/m1_2.3.4
remotes/origin_apps/hardware/test
remotes/origin_apps/m1
remotes/origin_apps/m1_2.3.4
remotes/origin_apps/master
git branch 创建一个新的本地分支,需要注意,此处只是创建分支,不进行分支切换,例如:
#git branch newbranch2
#git branch
* master
newbranch
newbranch2
当前的分支依然是master,不进行切换。
git branch -m | -M oldbranch newbranch 重命名分支,如果newbranch名字分支已经存在,则需要使用-M强制重命名,否则,使用-m进行重命名。
git branch -d | -D branchname 删除branchname分支
git branch -d -r branchname 删除远程branchname分支
例子:
git help branch中的一个例子:
$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6
$ cd my2.6
$ git branch my2.6.14 v2.6.14
$ git checkout my2.6.14
第三行符合git branch <branchname> [<start-point>]的格式,即以v2.6.14为start-point,创建新的本地分支branchname。
Git 是一个很强大的分布式版本控制系统。它不但适用于管理大型开源软件的源代码,管理私人的文档和源代码也有很多优势。
本来想着只把最有用、最常用的 Git 命令记下来,但是总觉得这个也挺有用、那个也用得着,结果越记越多。
http://www.cnblogs.com/1-2-3/archive/2010/07/18/git-commands.html
当前分支的 提交历史
--author 仅显示指定作者相关的提交。
$ git log --author=haiwang
查找 haiwang 提交的 版本;
$ git branch camera origin/camera
fatal: A branch named 'camera' already exists.
$ git branch -a
camera --> 本地的另一分支
* master --> " * " 标示了当前所在分支
remotes/origin/HEAD -> origin/master
remotes/origin/audio_dev_branch
remotes/origin/bl_test
remotes/origin/camera
remotes/origin/master
$ git branch -d camera --> 删除本地分支 camera
warning: deleting branch 'camera' that has been merged to
'refs/remotes/origin/camera', but not yet merged to HEAD.
Deleted branch camera (was 93cb3ab).
建立跟踪远程分支origin/camera的本地分支camera
$ git branch camera origin/camera
Branch camera set up to track remote branch camera from origin.
$ git checkout camera 切换到camera分支
M /cgen/apeditor/app_temp_db
M /custom/common/cgen/inc/cfg_module_default.h
M /custom/common/cgen/inc/cfg_module_file.h
Switched to branch 'camera'
$ git branch -a
* camera
master
remotes/origin/HEAD -> origin/master
remotes/origin/audio_dev_branch
remotes/origin/bl_test
remotes/origin/camera
remotes/origin/master
git branch
git branch 不带参数:列出本地已经存在的分支,并且在当前分支的前面加“*”号标记,例如:
#git branch
* master
newbranch
git branch -r 列出远程分支,例如:
#git branch -r
m/master -> origin_apps/m1_2.3.4
origin_apps/hardware/test
origin_apps/m1
origin_apps/m1_2.3.4
origin_apps/master
git branch -a 列出本地分支和远程分支,例如:
#git branch -a
* master
newbranch
remotes/m/master -> origin_apps/m1_2.3.4
remotes/origin_apps/hardware/test
remotes/origin_apps/m1
remotes/origin_apps/m1_2.3.4
remotes/origin_apps/master
git branch 创建一个新的本地分支,需要注意,此处只是创建分支,不进行分支切换,例如:
#git branch newbranch2
#git branch
* master
newbranch
newbranch2
当前的分支依然是master,不进行切换。
git branch -m | -M oldbranch newbranch 重命名分支,如果newbranch名字分支已经存在,则需要使用-M强制重命名,否则,使用-m进行重命名。
git branch -d | -D branchname 删除branchname分支
git branch -d -r branchname 删除远程branchname分支
例子:
git help branch中的一个例子:
$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6
$ cd my2.6
$ git branch my2.6.14 v2.6.14
$ git checkout my2.6.14
第三行符合git branch <branchname> [<start-point>]的格式,即以v2.6.14为start-point,创建新的本地分支branchname。
Git 是一个很强大的分布式版本控制系统。它不但适用于管理大型开源软件的源代码,管理私人的文档和源代码也有很多优势。
本来想着只把最有用、最常用的 Git 命令记下来,但是总觉得这个也挺有用、那个也用得着,结果越记越多。
http://www.cnblogs.com/1-2-3/archive/2010/07/18/git-commands.html