smartgit快速入门指导

来自官网,简单详细

SmartGitQuickstartGuide

syntevoGmbH,http://www.77cn.com.cn

2011

来自官网,简单详细

Contents

1Introduction2GitConcepts

2.1Repository,WorkingTree,Commit......................2.2TypicalProjectLifeCycle...........................2.3

Branches.....................................2.3.1WorkingwithBranches.........................2.3.2BranchesarejustPointers.......................2.4

Commits.....................................2.4.1It’sAllAboutCommits........................2.4.2PuttingItAllTogether.........................2.5TheIndex....................................2.6

MergingandRebasing.............................2.6.1“Normal”Merge............................2.6.2Fast-forwardMerge...........................2.6.3SquashMerge..............................2.7WorkingTreeStates..............................2.8Submodules...................................2.9

Git-SVN...............

......................3ImportantCommands

3.1Project-Related..............

...................3.1.1OpenWorkingTree...........................3.1.2CloningaRepository..........................3.2SynchronizingwithaRemoteRepository

...................3.2.1Push...................................3.2.2Pull...................................3.2.3Synchronize...............................3.3LocalOperationsontheWorkingTree.

...................3.3.1Stage...................................3.3.2Unstage.................................3.3.3Ignore..................................3.3.4Commit.................................3.3.5UndoLastCommit...........................3.3.6Revert...............

...................

3444556667899910101011121212121313131314141414141515

来自官网,简单详细

Contents

3.3.7Remove.....3.3.8Delete......BranchHandling....3.4.1Switch......3.4.2Checkout....3.4.3Merge......3.4.4Rebase......3.4.5AddBranch...3.4.6AddTag.....3.4.7BranchManager

........................................................................................................................................................................................................................................................................................1516161616161718181819

..................Properties

.....................................................................................................................................................................................................................................................................................................................................................................................................................................222223232326262627272929293031323333333334343435363636373838

3.4

4Directorytreeand letable5SystemProperties/VMOptions5.1GeneralProperties.........5.2UserInterfaceProperties......5.3UserInterfaceProperties......5.4SpecifyingVMOptionsandSystem

6InstallationandFiles

6.1LocationofSmartGit’sSettingsDirectory6.2NotableCon gurationFiles........6.3Company-wideInstallation.........6.4JRESearchOrder(Windows).......

7InternalsoftheSVNintegration

7.1Compatibilityandincompatibilitymodes....7.2Ignores(normalmodeonly)...........7.3EOLs(normalmodeonly)............7.4Externals(normalmodeonly)..........7.5Symlinksandexecutable les..........7.6Tags........................7.7Historyprocessing................

7.7.1Branchreplacements...........7.7.2Merges...................7.7.3Cherry-picks................7.7.4Branchcreation..............7.7.5Anonymousbranches...........7.8ThePushingprocess...............7.9Non-ASCIIsymbolssupport...........7.10SVNsupportcon guration............

7.10.1SVNURLandSVNlayoutspeci cation7.10.2Translationoptions............7.10.3Trackingcon guration..........7.11Knownlimitations................

来自官网,简单详细

Chapter1Introduction

SmartGitisagraphicalGitclientwhichrunsonallmajorplatforms.Gitisadistributedversioncontrolsystem(DVCS).SmartGit’stargetaudienceareuserswhoneedtomanageanumberofrelated lesinadirectorystructure,tocoordinateaccesstothese lesinamulti-userenvironment,andtotrackchangestothem.Typicalareasofapplicationincludesoftwareprojects,documentationprojectsandwebsiteprojects.

Acknowledgments

WewouldliketothankalluserswhohavegivenusfeedbackonSmartGit(e.g.viabugreportsandfeaturesuggestions)andtherebyhelpedustoimproveit.

来自官网,简单详细

Chapter2GitConcepts

ThissectionhelpsyoutogetstartedwithGitandtriestogiveyouanunderstandingofsomefundamentalGitconcepts.

2.1Repository,WorkingTree,Commit

First,weneedtointroducesomeGit-speci ctermswhichmayhavedi erentmeaningsinotherversioncontrolsystemssuchasSubversion.

ClassicalcentralizedversioncontrolsystemssuchasSubversion(SVN)haveso-called‘workingcopies’,eachofwhichcorrespondstoexactlyonerepository.SVNworkingcopiescancorrespondtotheentirerepositoryorjusttopartsofit.InGit,ontheotherhand,everythingisarepository,eventhelocal“workingcopy”,whichisalwaysacompleterepository,notjustapartialone.Git’sworkingtreeisthedirectorywhereyoucanedit les.Eachworkingtreehasitscorrespondingrepository.So-calledbarerepositories,usedonserversascentralrepositories,don’thaveaworkingtree.

Example

Let’sassumeyouhaveallyourproject-related lesinadirectoryD:\my-project.Thenthisdirectoryrepresentstheworkingtree,containingall lestoedit.Theattachedrepository(ormoreprecisely,therepository’smetadata)islocatedintheD:\my-project\.gitdirectory.

2.2TypicalProjectLifeCycle

Aswithallversioncontrolsystems,theretypicallyexistsacentralrepositorycontainingtheproject les.Tocreatealocalrepository,youneedtoclonetheremotecentralrepository.Thenthelocalrepositoryisconnectedtotheremoterepository,which,fromthelocalrepository’spointofview,isreferredtoasorigin.ThecloningstepisanalogoustotheinitialSVNchecko …… 此处隐藏：19818字，全部文档内容请下载后查看。喜欢就下载吧 ……