E, F. deleteall command, 352 directory structure, 350 export_data method, 353 inline_data method, 353 print_export method, 351 target directory, 351

Size: px

Start display at page:

Download "E, F. deleteall command, 352 directory structure, 350 export_data method, 353 inline_data method, 353 print_export method, 351 target directory, 351"

Marjorie Flowers
6 years ago
Views:

1 Index A Access control list (ACL), 299 Ancestry references, 184 Attributes, 288 binary files, 289 export-ignore, 294 export-subst, 294 keyword expansion, 291 merge strategies, 294 Authorized_keys file, 86 B Branching branch-management tools, 58 branch pointer, 51 checkout command, 50 commit, 43, 50 snapshots, 45 tree objects, 44 git branch, 53 hotfix branch, 52 iss53 branch, 51, 54 long-running branches, 59 master branch, 52 merge command, 52 rebasing client and server branches, 71 definition, 69 drawbacks, 73 master branch, 69, 72 merge command, 68 onto option, 71 rebase vs. merge, 76 SHA checksum, 75 topic branch, 70 remote branches, 61 cloning, 62 delete option, 68 fetch origin command, 63 pull command, 68 push command, 65 remote add command, 64 teamone/master server, 64 tracking, 66 switch branches, 46 divergent history, 49 HEAD pointer back, 48 working directory, 48 testing, 45 topic branches, 59 uncommitted changes, 51 C Centralized Version Control Systems (CVCSs), 3, 97 Command-line Git, 401 Commands git add, 408 git am, 417 git apply, 417 git archive, 415 git bisect, 416 git blame, 416 git branch, 411 git checkout, 411 git cherry-pick, 416 git clean, 411 git clone, 408 git commit, 410 git config, 407 git describe, 415 git diff,

2 index Commands (cont.) git difftool, 409 git fast-import, 418 git fetch, 413 git format-patch, 417 git fsck, 418 git gc, 418 git grep, 416 git help, 407 git init, 408 git log, 412 git merge, 412 git mergetool, 412 git mv, 411 git pull, 414 git push, 414 git rebase, 416 git reflog, 418 git remote, 415 git request-pull, 417 git reset, 410 git revert, 417 git rm, 410 git send- , 417 git shortlog, 415 git show, 415 git stash, 413 git status, 409 git submodule, 415 git svn, 418 git tag, 413 plumbing commands, 419 Configuration settings client configuration commit.template, 280 core.editor, 280 core.excludesfile, 281 core.pager, 281 help.autocorrect, 282 user.signingkey, 281 colors, 282 external diff tool, 283 external merge tool, 283 formatting and whitespace issues core.autocrlf, 286 core.whitespace, 287 git config command, 279 server configuration receive.denydeletes, 288 receive.denynonfastforwards, 288 receive.fsckobjects, 288 Credential storage system, 273 Custom importing process code implementation, 353 commit metadata, 352 deleteall command, 352 directory structure, 350 export_data method, 353 inline_data method, 353 print_export method, 351 target directory, 351 D Debugging binary search, 248 file annotation, 247 Distributed Version Control Systems (DVCSs), 4 E, F Environment variables, 383 commit object, 385 debugging, 386 diffing and merging, 385 GIT_ASKPASS, 387 GIT_FLUSH, 388 GIT_NAMESPACE controls, 388 GIT_REFLOG_ACTION, 388 GIT_SSH, 387 global behavior, 384 network operations, 385 pathspecs, 384 repository locations, 384 G Git adds data, 7 aliases, 41 in Bash, 397 command line tools, 9 commit history, 26 configuration set up checking, 12 editor, 12 identity, 11 data recovery, 379 data storage base version, 6 snapshots, 6 in Eclipse, 396 help commands, 12 installation, 9 on Linux, 9 on Mac, 9 on windows, 10 integrity, 7 maintenance,

3 Index overview, 5 in Powershell, 399 remote repositories, 33 cloning, 34 fetching, 35 pulls down data, 35 push command, 36 reading and writing, 34 remove and rename, 37 show command, 36 remove objects commit object, 381 expire option, 383 git verify-pack, 382 ignore-unmatch option, 382 rev-list command, 382 size-pack entry, 382 tree-filter option, 382 repository cloning, 16 commit changes, 23 existing directory, 15 file movement, 25 ignore files, 20 lifecycle status, 16 modified files, 18 remove files, 24 short status flag, 19 skip staging area, 24 staged and unstaged changes, 21 status command, 17 tracking files, 18 states, 8 tagging annotated tags, 38 lightweight tags, 39 listing, 37 push command, 40 updated rakefile commit, 39 undo command, 31 modified file, 33 staged file, 32 Visual Studio, 395 VPN client, 7 Zsh, 398 Git Daemon, Git Grep search, 200 GitHub, 131 API, 175 comment issues, 176 commit status, 178 GET request, 176 gitignore template, 176 address, 135 forking projects, 136 Markdown, 149 code snippets, 151 emojis, 152 images, 154 quoting, 152 tasklists, 150 Octokit, 180 organization management Audit Log, 170 menu items, 168 organization page, 169 team page, 170 Pull Request creation page, 137 Cross references, discussion page, 143 notifications, 142 line of code, 142 merge conflicts, 145 outdated diff, 143 patches, 145 repository creation (see Repository creation) Services and Hooks, 172 sign-up form, 132 SSH access, 132 Two-factor Authentication, 135 webhook code implementation, 174 configuration, 173 debugging, 175 workflow, 137 your avatar, 133 GitLab administration interface, 92 definition, 92 group administration screen, 94 hooks, 94 installation, 92 projects, 94 remote command, 95 users, 93 working principles, 95 Git log search, 201 Git protocol, 82 Git server bare repository, 84 hosted options, 95 setting up, 86 SSH access, 84 git-shell command, 87 GitWeb httpd option, 91 stop option,

4 index GitWeb (cont.) VirtualHost, 91 web-based visualizer, 90 GPG configuration, 197 everyone signs, 200 signing commits, 198 signing tags, 197 verification tags, 198 Graphical interfaces git-gui, 390 GitHub installation, 393 Mac, 392 windows, 392 workflow, 393 gitk, 389 H Hooks ACL system, 300 client-side, 295, 303 merge command, 297 post-checkout, 296 post-rewrite, 296 pre-auto-gc, 297 pre-push, 297 commit message format, 298 committing process commit-msg, 296 post-commit, 296 pre-commit, 296 workflows, 296 installation, 295 server-side, 298 post-receive, 297 pre-receive, 297 update script, 297 testing, 302 HTTP protocols Dumb cons method, 82 pros method, 81 Smart, 80, SSH cons method, 82 pros method, 82 I, J, K Interactive commands staging and unstaging files, 188 staging patches, 190 L Libgit2, 401 bindings LibGit2Sharp, 405 objective-git, 405 Pygit2, 405 ConfigError/ObjectError, 402 ODB implementation, 404 Rugged repository, 402 Line log search, 202 Local protocol cons, 80 definition, 79 pros method, 80 URL, 80 M, N Mercurial repository, 346 branches and bookmarks, 320 gitignore file, 319 git-remote-hg, 317 log command, 317 server-side repository, 317 workflow, 319 Merging, 50 abort option, 229 coflict check out, 232 commit creation, 55 diff format, 234 file stages, 230 ignore whitespace, 229 merge command, 54 merge commits, 236 reset-hard, 237 revert commit, 237 merge conflicts, 55, 227 merge log, 234 recursive mode, 239 snapshots, 55 submodules changes, 258 subtree merge, 240 O Objects cat-file command, 358 commit object, 362 hash-object command, 358 Ruby mode irb command, 364 require command, 364 zlib library,

5 Index tree object, 359 content structure, 361 data model, 360 read-tree command, 361 update-index command, 360 write-tree command, 360 P, Q Packfiles, 369 Perforce server Git Fusion, 323, 348 configuration, 325 revision graph, 329 SSL certificates, 325 virtual machine, 324 workflows, 327 Git-p4, 348 branching, 335 clone command, 330 setup, 330 workflow, 331 Plumbing commands, 357 cat-file command, 358 git verify-pack, 371 hash-object, 358 update-index, 360 Porcelain commands, 357 Protocols, 373 dumb protocol HEAD reference, 374 HTTP GET request, 374 packfiles, 375 smart protocol download data, 377 upload data, 375 R References, 365 directory objects, 366 HEAD file, 367 remote directory, 368 tags, 367 Refspec, 371 configuration file, 372 delete references, 373 master branch, 372 push value, 373 Replace command commit-tree command, 270 existing repository, 267 master branch repository, 269 onto argument, 270 remote repository, 268 SHAs upstream, 273 truncated repository, 271 Repository creation collaborators, 156 CONTRIBUTING file, 166 dropdown, 155 Notifications page, 163 notifications, 165 web notifications, 164 project administration default branch, 167 Transfer ownership option, 167 Pull Requests notifications, 158 fork and branch, 162 ls-remote command, 160 Merge button, 159 thread, 159 README file, 166 Rerere functionality, 242 Reset Demystified checkout, path reset, 220 reset command, 215 move HEAD, 216 recap, 219 update index, 217 working directory, 218 squashing commit, 222 three trees, 208 HEAD, 209 index, 209 working directory, 209 workflow diagrams, 210 Revision Selection ancestry references, 184 branch references, 183 range specifications, 185 double-dot syntax, 186 multiple points, 187 triple-dot syntax, 187 RefLog shortnames, 183 SHA-1 values, 181 single commits, 181 Rewrite commits filter-branch address, 208 remove files, 207 subdirectory, 207 last message, 203 muliple messages, 203 reordering commits, 205 splitting, 206 squashing,

6 index S Secure Shell (SSH) protocols cons method, 82 pros method, 82 public keys, 85 Stashing, 191 cleaning, 195 creation, 193 stash branch, 195 unapply command, 195 working directory, 192 Submodules abortion command, 264 aliases, 262 bundling, 264 cloning, 251 DbConnector directory, 249, 252 foreach command, 261 issues, 262 merging changes, 258 publishing changes, 257 upstream changes, 253 working directory, 255 Subversion server, 307, 344 annotation, 315 branching creation, 314 issues, 313 merge commit, 314 clone command, 309 commits back, 310 git svn command, 307 git svn dcommit, 312 git svn fetch, 312 git svn rebase, 311, 313 ignore commands, 316 server information, 316 set up, 308 style history, 315 T, U Team Foundation Server (TFS), 336 Team Foundation Version Control (TFVC), 336, 349 features, 339 Git-tf, 336 clone command, 337 workflow, Git-tfs, 336 clone command, workflow, V Version control system (VCS), 1 W, X, Y, Z Workflows $ git checkout-b featureb origin/master, 114 $ git push-u myfork featurea, 113 $ git remote add myfork (url), 113 $ git request-pull origin/master myfork, 113 advantages, 101 benefit of Git, 112 centralized workflow, 97 command-line program, 117 Commit history after featurea working, 115 contribution, 100 dictator and lieutenants, 99 feature, 108 featurebv2 branch, 115 fetch and merge origin/master, 107 git fetch origin, 110 git format-patch, 116 git merge issue54, 105 Git source code, 117 guidelines, 100 implementation, 115 initial commit history, 114 integration-manager, 98 Jessica s history, 104, 111 Jessica s Machine, 108 John s divergent history, 103 John s history, 104 managed-team basic sequence, 112 origin/master syntax, project maintaining $ git diff master, 122 $ git log contrib-not master, 122 $ git merge-base contrib master, 122 build number generation, 129 checking out remote branches, 121 conflicted merge or rebase operation, 120 git archive, 129 large-merging workflows, 125 limit-log-function.patch, 119 long-running branches, 124 merging workflows, 123 patches, rebasing and cherry picking workflow, 126 rerere, 128 shortlog, 130 tagging releases, 128 working, 118 sequence of multiple-developer,

Index. Alias syntax, 31 Author and commit attributes, 334

Index. Alias syntax, 31 Author and commit attributes, 334 Index A Alias syntax, 31 Author and commit attributes, 334 B Bare repository, 19 Binary conflict creating conflicting changes, 218 during merging, 219 during rebasing, 221 Branches backup, 140 clone-with-branches