git及-repo.ppt

,单击此处编辑母版标题样式,单击此处编辑母版文本样式,第二级,第三级,第四级,第五级,*,Git&repo,使用,-Gaopeng,概述,Git,Git(The stupid content tracker),是,Linux Torvalds,为了帮助管理,Linux,内核开发而开发的一个开放源码的,分布式,版本控制软件,repo,Android,项目编写了一个名为,repo,的,Python,脚本来统一管理多个,git,项目的仓库,Git,教程,ftp.cvut.cz/pub/software/scm/git-core/docs/git.html,www.kernel.org/pub/software/scm/git/docs/user-manual.html,help,git config,$HOME/.gitconfig,.git/config,Git,常用命令,创建仓库的两种方法,git init-bare,git clone-o -b -,Git,常用命令,更新仓库的两种方法,git pull ,git fetch,git merge,实例,git pull korg/froyo-atxx,git fetch korg,git merge korg/froyo-atxx,Git,常用命令,远程仓库,git remote add ,git rm,git show,Git,常用命令,分支管理,git branch ,git checkout b ,git branch(-m|-M),git branch(-d|-D)-r,Git,常用命令,仓库代码提取,git checkout,git checkout-files,Git,常用命令,添加删除代码,git add,git rm,git mv ,Git,常用命令,信息查看,git status-short,git diff-cached-name-status commit/branch,git log-n commit-name-status-graph,git show refspec:path/to/file,Git,常用命令,head,指代,HEAD,HEAD,HEAD,HEAD1,HEAD2,FETCH_HEAD,Git,常用命令,提交代码到本地仓库,git commit-m,Git,常用命令,分支合并,git merge,git merge,Git rebase ,Git,常用命令,代码抽取,git cherry-pick,Git,常用命令,代码回退,git reset -,git reset-soft,git reset-mixed,git reset-hard,Git-reset,working index HEAD target working index HEAD,-,C C C D -soft C C D,-mixed C D D,-hard D D D,working index HEAD target working index HEAD,-,A B C D -soft A B D,-mixed A D D,-hard D D D,Git,常用命令,添加,tag,git tag ,git tag-d,Git,常用命令,提交代码到远程仓库,git push ,从远程仓库提取分支代码,git fetch :,用,repo,管理,android,代码,初始化本地仓库,repo init-u git:/android.git.kernel.org/platform/manifest.git-b froyo,同步代码,repo sync,新建,branch,repo start,操作,git,项目,repo forall.-c .,Example,获取代码,repo init-u git:/10.99.63.68/codequrora/platform/manifest.git-b -m,repo sync,repo start,repo forall-c pwd#show all git projects,Example,代码开发,cd hardware/qcom,git checkout b my_dev,git add,git ci m“my comments 1”,git add,git ci m“my comments 2”,Example,代码提交,git checkout my_dev,git reset-soft HEAD2,git commit m“”,git checkout master,git pull#update main branch,git cherry-pick or git merge my_dev,git ci m“my comments”,git status or git log#check the status,git push ,Q&A,