Pro Git · Eduspaces ·
https://eduspaces.ro/s/pro-git/figuri/?cap=s-7
https://eduspaces.ro/s/pro-git/figuri/?cap=s-7
Figuri și tabele
188 figuri și tabele, fiecare legată de conceptele pe care le ilustrează (după legendă, etichetele din imagine și textul care o citează).
Figure 136 p. 230
Example history for range selection
Commit history
Figure 137 p. 259
Git’s typical workflow
Commitgit checkoutHEADStaging area
Figure 138 p. 260
Newly-initialized Git repository with unstaged file in the working directory
RepositoryWorking treeUnstagingHEAD
Figure 139 p. 261
File is copied to index on git add
git addStaging areaHEADRepository
Figure 140 p. 262
The git commit step
git commitHEADRepositoryStaging area
Figure 141 p. 263
Git repository with changed file in the working directory
RepositoryWorking treeHEADStaging area
Figure 142 p. 264
Staging change to index
Staging areagit addHEADRepository
Figure 143 p. 265
The git commit step with changed file
git commitHEADmasterRepositoryStaging area+1
Figure 144 p. 266
Git repository with three commits
RepositoryCommitHEADmasterStaging area+1
Figure 145 p. 267
Soft reset
git resetHEADmasterRepositoryReset modes+1
Figure 146 p. 268
Mixed reset
git resetHEADmasterRepositoryReset modes+1
Figure 147 p. 269
Hard reset
git resetHEADmasterRepositoryReset modes+1
Figure 148 p. 270
Mixed reset with a path
git resetHEADRepositoryStaging areaWorking tree
Figure 149 p. 271
Staging file to index
Staging areaHEADRepository
Figure 150 p. 272
Soft reset with a path to a specific commit
git resetCommitHEADmasterRepository+1
Figure 151 p. 273
Git repository
RepositoryHEADmasterStaging areaWorking tree
Figure 152 p. 274
Moving HEAD with soft reset
HEADgit resetmasterRepositoryReset modes+2
Figure 153 p. 275
Git repository with squashed commit
RepositoryCommitSquashinggit commitHEAD+2
Figure 154 p. 276
git checkout and git reset
git checkoutgit resetCommitHEADmaster
Figure 155 p. 288
Accidental merge commit
Merge commitHEADmaster
Figure 156 p. 289
History after git reset --hard HEAD~
HEADCommit historyReset modesmaster
Figure 157 p. 290
History after git revert -m 1
Commit historygit revertHEADmaster
Figure 158 p. 290
History with a bad merge
Commit historyMergeHEADmaster
Figure 159 p. 291
History after re-merging a reverted merge
MergeCommit history
Figure 160 p. 296
Two branches changing the same part of the same file differently
Branch
Figure 161 p. 298
Recorded resolution for FILE
Rerere
Figure 162 p. 300
Automatically resolved merge conflict using previous resolution
Merge conflictRerere
Figure 163 p. 329
Example Git history
Commit history
Figure 164 p. 330
Creating a new history branch
BranchCommit history
Figure 165 p. 332
Creating a base commit using commit-tree
CommitTree object
Figure 166 p. 333
Rebasing the history on top of the base commit
CommitCommit historyRebase
Figure 167 p. 335
Combining the commits with git replace
CommitCommit history