referredgit
git 使用 时间:2021-02-24 阅读:(
)
GitandGithubKatieOsterriedC2SMCOSMOGeneralMeeting2016Outline1Introductiontogit2Basicgitfeatures3Workingwithremotes4Githubwebinterface5UsefulgitresourcesOutline1Introductiontogit2Basicgitfeatures3Workingwithremotes4Githubwebinterface5UsefulgitresourcesWhatisgitVersioncontrolsystem(likeSVN)Toolfortrackingofchangesinlesinorderto:RecordreasonsforchangesComparewithandincorporateversionsfromothersourcesHavemultiplepeopledevelopingthesamecodeMaintainseveralparallelversionsofthesamecodeinasystematicwayDesignedforcollaborative,opensourceworkowsSource:https://git-scm.
com/downloads/logosStatusoftheC2SMgitmigrationC2SMhostedCOSMOandrelatedcodesweresuccessfullymigratedfromSVNtogitinDecember2015AllthecodedevelopmenthistorywasretainedduringthemigrationCodeisnowhostedongithub.
comin42separatecoderepositoriesFieldextraandExtparocialversionsnowhostedonGithubGitTerminology1.
repository:thelocationofthesavedcodeanditshistory2.
branch:anindependentlineofdevelopment3.
master:thedefaultbranch4.
commit:asnapshotofyourprojectatacertaintime5.
tag:afrozenreferencetoaparticularcommit6.
HEAD:thecurrentlycheckedoutcommit7.
index/stagingarea:areabetweenworkingdirectoryandrepository8.
remote:arepositorylinkedtothelocalrepositoryImportantdierencesfromSVNGitisadistributedversioncontrolsystemEveryuserhasthewholerepositoryUserscansavechangestothelocalrepositorywithoutanetworkRepositoriescanbelocatedanywhereandlinkedtogethereasilyWorkowforagroupmustbeclearlydenedSource:http://www.
codemag.
com/Article/1105101ImportantdierencesfromSVNGitusesastrictdenitionofbranchesandtagsBranchesandtagsarenotassociatedwithdierentdirectories(likeSVN)BranchesandtagsaresimplypointerstoacertaincommitThetrunkequivalentiscalled"master"andisnodierentfromanyotherbranchImportantdierencesfromSVNGitusesdierentcommitIDsLinearrevisionnumbersdon'tworkEachcommithasauniqueidentiergeneratedbyanalgorithmSeriesof40charactersandnumbersCommitscanbegenerallyreferredtobytherst6-8charactersoftheIDExample:commitf3abe64fc121b75f3f0566c73f2f1a4e8fd68eCanbereferredtoas:f3abe64ImportantdierencesfromSVNGitusesastagingareaAdditionallayerbetweenworkingdirectoryandrepositoryStoresinformationaboutwhatwillgointhenextcommitAllowsyoutogroupcommitslogicallySource:https://git-scm.
com/book/en/v1/Getting-Started-Git-BasicsOutline1Introductiontogit2Basicgitfeatures3Workingwithremotes4Githubwebinterface5UsefulgitresourcesLocalgitworkow1.
Startorcopyagitrepositorylocally(gitinit,gitclone)2.
Makeafeaturebranchfordeveloping(gitbranch,gitcheckout)3.
Makesomecodechanges4.
Savethecodechangestothestagingarea(gitadd)5.
Savethecodechangestotherepository(gitcommit)6.
Mergethechangesfromthefeaturebranchtothemaster(gitmerge)HowtostartarepositoryCommandstostartworkingwithgit:gitcongSetcongurationvariablesforgitUsage:gitconguser.
name"YourName"Usage:gitcong--globaluser.
email"youremail@email.
com"gitinitCreatesanemptygitrepositoryCreatesbydefaultthemasterbranchCreatesthe.
gitfolderandcontentsUsage:gitinitgitcloneCopiesanexistinggitrepositoryCreatesandnavigatestothecurrentbranchofthecopiedrepositoryLinkstheoriginalrepositoryasaremoteUsage:gitclone/path_to_original/path_to_copyHowtomakecommitsCommandsforsavingcodechanges:gitaddSavescodechangestothestagingareaCanaddallorsomeofthecurrentcodechangesCanbeperformedmultipletimesbeforeacommitUsage:gitadd/path_to_legitcommitSavesthechangesinthestagingareatotherepositoryCreatesauniquecommitIDSavesalogmessagefromtheuserUsage:gitcommitHowtoexaminearepositoryCommandsforgettinginformationaboutarepository:gitlogDisplaysthelogofallthecommitsCanbecustomizedthroughcommandlineoptionsUsage:gitloggitstatusShowsthestatusoftheworkingcopyStateswhichleshavebeenplacedinthestagingareaShowswhichleshavebeenmodiedbutnotplacedinthestagingareaUsage:gitstatusgitdiShowsthechangesbetweentwoversionsofthecodeManyoptionsforcustomizationUsage:gitdiHowtoexaminearepositoryCommandsforlookingatpreviouscommits:gitcheckout(oldcommit)DisplaystheworkingcopyasitwaswhenthecommitwasmadeShouldbeusedforlookingatoldcommits,notdevelopmentAnythingcommittedwillNOTbesavedtoacurrentbranchUsage:gitcheckoutcommitIDgitcheckout(singlele)UpdatestheleinthecurrentworkingcopyUsedforrecoveringoldversionsoflesAnythingcommittedWILLbesavedtothecurrentbranchUsage:gitcheckoutcommitID/path_to_leHowtocreateandswitchtoabranchCommandsforworkingwithbranches:gitbranchListscurrentbranchesorcreatesanewoneCreatesbranchfromcurrentHEADDoesnotautomaticallyswitchtonewbranchUsage:gitbranchbranch_namegitcheckout(branch)ChangesthelesintheworkingcopytothebranchLocalchangesarepreservedUsage:gitcheckoutbranch_nameMergingwithoutcommitsFast-forwardmergeisthedefaultbehaviorgitmergeCombinesthetargetbranchwiththecurrentbranchDoesnotcreateacommitunlessithasto(oryoutellitto)CalledfromthebranchyouwanttomergeintoUsage:gitmergebranch_nameMergingwithoutcommitsFast-forwardmergeisthedefaultbehaviorgitmergeCombinesthetargetbranchwiththecurrentbranchDoesnotcreateacommitunlessithasto(oryoutellitto)CalledfromthebranchyouwanttomergeintoUsage:gitmergebranch_nameMergingwithoutcommitsFast-forwardmergeisthedefaultbehaviorgitmergeCombinesthetargetbranchwiththecurrentbranchDoesnotcreateacommitunlessithasto(oryoutellitto)CalledfromthebranchyouwanttomergeintoUsage:gitmergebranch_nameMergingwithcommitsConictingmergesalsooccurgitmergeAcommitismadeforaconictingmergeConictsmustberesolvedbeforemergeiscompletedRemoveconictmarkersfromconictedlesgitaddconictedlegitcommitconictedleUsage:gitmergebranch_nameOutline1Introductiontogit2Basicgitfeatures3Workingwithremotes4Githubwebinterface5UsefulgitresourcesgitusesremotesEachlocalrepositorycanconnecttomultipleremoterepositoriesRemotescanbelocaloracrossanetworkRemotescanberead-onlyorread-writeaccessWorkowmustbeclearlydenedfromthebeginningSource:http://thepilcrow.
net/explaining-basic-concepts-git-and-githubHowtolinktoaremoteCommandsforconnectingtoandexaminingremotes:gitremoteListsalloftheremoterepositoriesUsing-voptionlistsalltheremoterepositoriesandtheirpathsUsage:gitremote(-v)gitremoteaddConnectsanexistingrepositorywitharemoteoneUsage:gitremoteaddremote_name/path_to_remotegitremoteshowDisplaysdetailedinformationabouttheselectedremoteListsbranchesinremoterepositoryandhowtheyarelinkedtothelocalrepositoryUsage:gitremoteshowremote_nameHowtogetcodefromaremoteCommandsforexchangingcodewithremotes:gitfetchUpdatesdatainremotebranchesoflocalrepositoryCantheninspectand/ormergethisdataintolocalbranchesUsage:gitfetchremote_namegitpullUpdatesdatainremotebranchesoflocalrepositoryAutomaticallymergesremotedataintolocalbranchesgitpull=gitfetch+gitmergeUsage:gitpullremote_namegitpushSendschangesintoremoterepositoryMustdoagitfetchandgitmergerst,tomakesurethatthelocalbranchisuptodatewiththeremoteUsage:gitpushremote_namebranch_nameRemotebranchesGitusesremotebranchestotrackchangestoremoterepositoriesBranchesinthelocalrepositorycontainingdatafromremotesCanbedisplayedusinggitbranch-aCreatedduringgitcloneautomaticallyTaketheformremote_name/branch_nameSource:https://git-scm.
com/book/en/v2/Git-Branching-Remote-BranchesDemonstrationOutline1Introductiontogit2Basicgitfeatures3Workingwithremotes4Githubwebinterface5UsefulgitresourcesGithubWebinterfaceforhostingremotesWebserviceshostremoterepositories(canbepublicorprivate)ProvideinterfacesforvisualizingrepositoriesSupportcollaborationandgoodcodingpracticesCanalsoeditlesandmakecommitsthereSource:https://github.
com/logosPermissionsTherearethreedierentlevelsofpermissionsforaccessingthecoderepositoriesonGithub:1.
OwnersTwoorthreepeopleonlyHavecompletecontroloverthecoderepositoriesCancreateordeleterepositories,addusers,andwritetoeveryrepository2.
AdminsOneortwopeopleforeachrepository(admin-codename)HavewriteandreadaccesstotheirassignedrepositoryAddnewversionsofcodeandincorporatenewfeaturesandbugxes3.
UsersEveryonewhoisnotanowneroradminHavereadaccesstoallofthecentralrepositoriesPullRequestsPullrequestsareusedtoreviewcodebeforemergingnewfeaturesintothemaincodebaseRequestforchangesfromafeaturebranchtobeputintocentralrepositoryGeneratedthroughwebinterface(notcommandline)CanbemergedusingwebinterfaceifnomergeconictsexistWebinterfacefacilitatesreviewofandcommentingoncodebeforepullrequestisgrantedSource:https://www.
atlassian.
com/zh/git/workows#!
pull-requestIssuetrackingWeusetheissuetrackeronGithubasanorganizationaltoolIssuetrackersallowyoutokeeptrackofknownbugs,desiredfeatures,andotherto-doitemsforthecodeIssuescanbeassignedtoaspecicpersonOtheruserscansubscribetobenotiedwhenknownissuesareresolvedIssuescanbecolor-codedandlabeledsotheyareeasilylteredAnybodywithaccesstotherepositorycancommentonissuesCosmo-prereleaserepositoryworkow1.
Copytherepositorytoyourlocalmachine(gitclone)2.
Makeafeaturebranchforyourowndevelopment(gitbranch)3.
MakechangestoyourlocalrepositoryfollowingthelocalGitworkow4.
Savethechangestothecosmo-prereleaserepository(gitpush)5.
Makeapullrequesttostartthecodereviewprocess(Generatepullrequestusingwebinterface)6.
TestthebranchusingtheautomatedtestingprogramJenkins('launchjenkins'commandinpullrequestcomments)7.
Oncetestshavepassedandcodehasbeenreviewed,thecodeownerwillmergethepullrequest(Mergepullrequestusingwebinterface)DemonstrationOutline1Introductiontogit2Basicgitfeatures3Workingwithremotes4Githubwebinterface5UsefulgitresourcesBestPracticesSomebestpracticeswhenworkingwithGit:ChooseaworkowatthebeginningofaprojectandstickwithitWherewilldevelopmentofnewfeaturesoccur(branches,forks)WhatisthenamingconventionforbranchesandforksWhoisresponsibleforthecentralrepositoryHowwillthecodereview/pullrequestprocessworkReviewcodeinstagingareabeforecommittingitCommitsmalllogicalchangesMakeusefulcommitmessagesthatcanbeunderstoodbyanyoneFirstlineofmessageshouldbeaonelinesummaryDetailsofcommitfollowthesummaryKeeprepositoryclean-removeunused/nishedbranchesGitResourcesgithelpDisplaysthemanpageforthegivencommandDisplaysgeneralgitinformationwhennocommandnameisgivenUsage:githelp(command_name)http://git-scm.
com/ComprehensivedescriptionofGitcommandsandconceptshttp://gitref.
org/Quickreferenceguideforcommandshttps://training.
github.
com/kit/downloads/github-git-cheat-sheet.
pdfCheatsheetwithGitcommandsGraphicalgittoolsBuilt-ingitgraphicaltoolsgitkDisplayschangesinarepository;informationaboutcommitsCannotbeusedtomakecommitsgit-guiUsedformakingchangestoarepositoryCancommit,branch,merge,andinteractwithremotesDoesnotshowcodehistoryThirdpartygitgraphicaltoolsSourceTreeCancommit,branch,merge,andinteractwithremotesCanviewhistoryandcommitsOnlyforOS:MacandWindowsSmartGitCancommit,branch,merge,andinteractwithremotesCanviewhistoryandcommitsOS:Mac,Linux,andWindowshttp://www.
syntevo.
com/smartgit/
企鹅小屋怎么样?企鹅小屋最近针对自己的美国cn2 gia套餐推出了2个优惠码:月付7折和年付6折,独享CPU,100%性能,三网回程CN2 GIA网络,100Mbps峰值带宽,用完优惠码1G内存套餐是年付240元,线路方面三网回程CN2 GIA。如果新购IP不能正常使用,请在开通时间60分钟内工单VPS技术部门更换正常IP;特价主机不支持退款。点击进入:企鹅小屋官网地址企鹅小屋优惠码:年付6折优惠...
优惠码50SSDOFF 首月5折50WHTSSD 年付5折15OFF 85折优惠,可循环使用荷兰VPSCPU内存SSD带宽IPv4价格购买1核1G50G1Gbps/3TB1个$ 9.10/月链接2核2G80G1Gbps/5TB1个$ 12.70/月链接2核3G100G1Gbps/7TB1个$ 16.30/月链接3核4G150G1Gbps/10TB1个$ 18.10/月链接阿联酋VPSCPU内存SS...
DiyVM是一家低调国人VPS主机商,成立于2009年,提供的产品包括VPS主机和独立服务器租用等,数据中心包括香港沙田、美国洛杉矶、日本大阪等,VPS主机基于XEN架构,均为国内直连线路,主机支持异地备份与自定义镜像,可提供内网IP。最近,商家对香港机房VPS提供5折优惠码,最低2GB内存起优惠后仅需50元/月。下面就以香港机房为例,分享几款VPS主机配置信息。CPU:2cores内存:2GB硬...
git 使用为你推荐
邮箱打不开怎么办我的邮箱打不开怎么办依赖注入Spring 的依赖注入是什么意思?微信如何建群微信怎么建立群显卡温度多少正常显卡温度多少正常iphone越狱后怎么恢复iPhone越狱后怎么恢复?人人逛街人人逛街评论怎么不显示链接了?好像4月28日就不能显示了。是什么原因呢?iphone6上市时间苹果6什么时候出来云挂机有免费的云挂机软件吗?系统分析员系统分析员的工作内容宽带接入服务器互联网的接入方式有哪几种?
域名买卖 哈尔滨域名注册 北京服务器租用 工信部域名备案 tier BWH 便宜建站 godaddy域名优惠码 京东云擎 evssl html空间 英文站群 华为4核 本网站服务器在美国 柚子舍官网 softbank邮箱 刀片式服务器 免费活动 美国在线代理服务器 网通服务器托管 更多