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

Transcription

1 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 directory parameter, 121.gitconfig file, 121 $ git list-remote-branches, 122 PATTERN string, 122 REPLACEMENT string, 122 shell command, 123 URL parameter, 121 create and switch branches doc creation, dot label, 106 features, 106 $ git branch command, 111, 113 $ git checkout master, 111 git/head file, gitk application, 110 $ gitk commands, 111 $ git log command, $ git pack-refs all, 111 $ git reflog entries, 115.git/refs/heads/master file, 113 HEAD, 114 info creation, 110 $ ls command, 111 loose format, 112 master branch, 107 packed format, 112 repository, 106 revision identification, 115 definition, 105 deleting local branches, 137 detached HEAD state ancestor references, dangling revisions, 124 $ git checkout master command, 127 $ git log command, 124, 127 $ git log oneline command, 127 $ git log oneline decorate prints, 129 parameters, 124 repository state, 125 symbolic reference HEAD, 128 rename branches, 141 repository commit connection, 119 doc branch, 116 $ git branch command, 116 $ git checkout command, 119 $ git clone command, 115.git/config file, 120.git/HEAD file, 119 info branch, 116 local/remote connection, 119 local tracking branch, 116, 118, 120 master branch, 116 ordinary local branch, 116, 118 properties, 119 remote branches, send/receive connection, 119 reset and cleaning branch, 129 switching branches (see Switching branches) 381

2 index C Central repository coworking with collaboration, 232 diverging John s and Sarah s work, 236 $ git clone command, 234 $ git clone shared-repo sarahs-repo, 234 $ git pull, 241 $ git push, 241 $ git push -u origin master, 234 initialization, 232 jons-repo $ git log output, 240 master branch, 232, 241 (n-1) merge commits, 246 origin remote, 232 repositories after John s $ git pull origin master command, 236 repositories after Sarah s $ git push -u origin master, 235 revision in private repository, 233 sarahs-repo $ git log output, 240 shared-repo repository, 233 state after John s a1, a2, a3 commits, 233 state after Sara s b1 and b2 commits, 235 tracking branches during commit, 242 tracking branches during pull operation, 244 tracking branches during pushes, 243 coworking without, 258 Cgit CGI application, 314 Conflict resolution in binary files (see Binary conflict) forcing binary mode during merge, 223 in text files (see Textual conflicts) cp command, 151 D, E Divergent branches creating bulbs, 177 $ git reset -hard [SHA-1] command, 166 linear history fast-forwarding, 172 $ git rebase master feature, 172 starting point and result, 171 manual rebasing $ git am *.patch, 167, 169 $ git checkout -B feature, 167, 170 $ git checkout `git rev-parse master`, 167, 169 $ git cherry-pick command, 170 $ git format-patch -ignore-if-in-upstream master, $ git log-oneline master..feature, 168 $ git rev-parse master, 169 $ rm *.patch removal, 167, 170 merging, 154 parallel, 151 repository before and after rebasing, 164 revisions, 165 three branches $ git log-oneline-graph-decorate -all, 173 $ git merge-base feature brave-idea, 174 ^`git merge-base feature brave-idea`, 175 ^`git merge-base master feature`, 175 repository, 172 transforming feature branch, 163 undoing, 166 working directory, 166 F Fast-forwarding branches avoiding, 156 merging feature branch into master branch, 150 undoing, 151 Feature branch implementation, 148 merging into master branch, 150 Files management file rename, 96 git mv, 93 standard mv command, 95 mixed states, 98 modified file, 96 commit files, 85 $ git simple-commit, 82 $ git status, 84 staging area, 84 states _M and M_, 84 new file and commit, 79, 96 removed file, 96 procedure, 87 recipe flow of, 4, 88 standard rm command, 89 repository s structure, 101 unmodified and untracked file, 91 G Git branching model, 1 configuration, 6 data integrity, 1 definition, 1 distributed version control system, 2 git manual, 5 installation on Linux, 4 on OS X, 4 on windows, 2 382

3 Index locality, 2 open-source project, 2 $ git branch command, 113, 116, 120 $ git checkout command, 119 $ git checkout master command, 126 $ git diff command $ git diff -check, 360 $ git diff -unified=1 HEAD~ HEAD command, 357, 359 file numbers.txt, 355 output, 356, 358 git directory, 15, 18 Github.com account creation, 327 existing project, 335 organization account, 336 pull request accept, 351 reworking, 348 sending, 340 repository, 331 SSH keys configuration, 328.gitignore cleanup ignored files, 372 commands, 371 with.dist files, 372 repository status, 371 rules, 371 settings, 371 using.git/info/exclude file, 373 $ gitk command, 153 $ git log -oneline -graph -all command, 159 Gitolite package admin.pub, 323 configuration, 318 controlled repository, 321 definition of, 280 gitolite-admin repository, 320 git@localhost account, 323 git-shell, 322 installation, 317 management tasks, 323 managing repositories, 324 new repository creation, 319 new user creation, 317 $ sudo apt-get command, 322 vagrant account, 322 Gitweb CGI application, 311 H Hosting repositories cgit, 280 cgit CGI application, 314 compiling git, 289 with git daemon booting two virtual machines, 308 cloning repositories, 306 port forwarding, 307 Vagrantfile creation, 305 gitolite package (see Gitolite package) Gitweb, 280 Gitweb CGI application, 311 http protocol, 309 SSH (see Secure shell (SSH)) VirtualBox and vagrant installation, 280 virtual Linux $ vagrant ssh command, 282 $ vagrant up, 281 directory creation, 281 guest system, 284 host system, 284 root s account access, 287 starting, stopping, and destroying, 285 synchronized folders, 287 Ubuntu Linux 12.4, 284 Vagrantfile contents, 283 VirtualBox lists, 283 virtual host, SSH session, 286 virtual machine states, 285 Windows, 284 virtual system, 280 HTML 5 Boilerplate repository, 37 Http protocol, 309 I, J, K $ ls command, 111 L Line endings checkout files without, 362 commit files without, 360 to CRLF line ending, 364 for individual files and directories, 368 to LF line ending, 366 unintended conversion, 367 Local tracking branches, 118 M merge commit, 155 Merge pull request button, 353 Merging branches diverged branches merging, 154 parallel,

4 index Merging branches (cont.) fast-forwarding branches avoiding, 156 merging feature branch into master branch, 150 undoing, 151 feature implementation, 148 multiple branches diverging, 157 merging, 159 Modified files, 100 N Non-bare repositories, 272 Non-merge commit, 155 O Ordinary local branches, 118 P, Q Partial rebasing, 175 Plumbing command, 5 Porcelain commands, 5 R Rebasing branches with bulbs, 179 divergent branches (see Divergent branches) partial rebasing, 175 preserving merges, 180 rebasing definition, 163 subbranches, 178 Remote branches accepting contributions, 267 appending commits, 268 branch-name, 265 for contributions, 266 doc branch, $ git branch command, 264 $ git fetch command, 266 $ git push origin foo\:bar command, 265 initialization, 262 initial revision, 262 local branch without -u, 265 removing, 271 rewriting history with $ git push -f, 270 shared repository with many branches, 262 special-unit-tests, 263 Remote repositories coworking with central repository collaboration, 232 diverging John s and Sarah s work, 236 $ git clone command, 234 $ git clone shared-repo sarahs-repo, 234 $ git pull, 241 $ git push, 241 $ git push -u origin master, 234 initialization, 232 jons-repo $ git log output, 240 master branch, 232, 241 (n-1) merge commits, 246 origin remote, 232 repositories after John s $ git pull origin master command, 236 repositories after Sarah s $ git push -u origin master, 235 revision in private repository, 233 sarahs-repo $ git log output, 240 shared-repo repository, 233 state after John s a1, a2, a3 commits, 233 state after Sara s b1 and b2 commits, 235 tracking branches during commit, 242 tracking branches during pull operation, 244 tracking branches during pushes, 243 coworking without central repository, 258 linear history accessing remote branches, 257 [ahead x] and [behind y] messages, 256 $ git checkout doc, 257 Git fetch command, 255 $ git rebase command, 257 $ git rebase origin/master command, 257 $ git status -sb, 257 initialization, 249 John and Mark parallel working, 250 John downloading Mark s work, 254 John s successful upload of shared repository, 251 linear structure, 249 Mark s divergent branch problem solution, 251 rebasing local tracking branch, 256 manual cloning definition of remote, 228 directory creation, 228 information storage, 231 initialization, 228 js-git project, 227 local master branch, 230 Refspec, tracking remote branch, unset parameter, 231 non-bare repositories, 272 remote branches accepting contributions, 267 appending commits, 268 branch-name, 265 for contributions,

5 Index doc branch, $ git branch command, 264 $ git fetch command, 266 $ git push origin foo\:bar command, 265 initialization, 262 initial revision, 262 local branch without -u, 265 removing, 271 rewriting history with $ git push -f, 270 shared repository with many branches, 262 special-unit-tests, 263 Remote tracking branches, 118 Repositories. See also Remote repositories agatha-christie.txt, 43 aliases for commands, 27 analyze Github repositories, 34 analyze repository with git log and shortlog commands, 24 characteristics, 46 clone Atlassian AUI repository, 11 clone bare repository, 19 clone jquery git repository, 8 clone local repository, 13 copy local repository, 14 delete/restore working directory contents, 18 existing project, 70 explore git repository contents, 15 explore history with git log command, 20 git commit command, 42 $ git init, 46 $ git log, 42 git s alias, 66 git simple-commit alias, 73 git snapshot alias.gitkeep., 52 sing-a-song-of-sixpence.txt, 49 snapshot creation, 47 Songs for children project, 49, $ git status, 43 hosting repositories (see Hosting repositories) loosing commits, 75 mapping names, 55 recipe 1, 44 reflog, 66 remove.git directory, 37 restoring revisions git checkout, 63 git reset, 61 uncommitted changes, 70 visualize repository history, 35 working directory, 47 Revision cherry-picking revisions, editing older revisions, $ git commit -amend command, 184 new repository, 183 recent, removing, reordering, re-using reverted branch, reverting, reverting merge commit revisions $ git revert command, 201 $ git revert -no-edit -m 1 HEAD~, 201 $ git revert -no-edit -m 2 HEAD~, 202 feature branch, 199 master branch, 199 merge branch feature commit, 201 new repository, 200 splitting $ git reset command, 191 $ git status -s, 192 $ git status -sb, 192 into many different revisions, 190 lorem.txt file, 192 new repository, 190 soft, mixed, hard option, squashing branch, $ git rebase -i HEAD~3, 188 last three revisions, 187 new repository, 187 subcommands, 189 user.name and user. configuration, 185 S Secure shell (SSH) authorization access granting, 298 authorized_keys, 302 configuration, 303 generating keys, 297 new account creation, 296 new repository initialization, 296 remote repository, 299 RSA keys, 302 sending public keys, 298 $ sudo adduser command, 300 cloning repository, 293 coping a bare repository, 292 key, 329 repository storing, 294 $ vagrant halt, 294 SHA-1 algorithm, 22 Staged files, 100 Subbranches, creating bulbs, 178 Switching branches bare repository, 144 checking out files, 142 with conflicts 385

6 index Switching branches (cont.) merge changes, 134 stashing uncommitted changes, 133 wrong branch, 135 without conflicts, 130 Syntax for.gitconfig file, 30 T Tags annotated tags, 375 command, 374 create, delete, and list, 376 example, 375 $ git branch, 377 $ git checkout, 377 $ git reset, 377 lightweight tags, 375 publishing, 376 tag object, 375 with v1.2.3, 374 Textual conflict creating conflicting changes, 209 merge conflict edit conflict file, 213 $ git add command, 214 $ git commit -no-edit command, 213, 215 $ git merge-base en fr command, 214 $ git status -s, 213 problem, 211 rebasing edit conflict file, 218 $ git add numbers.txt command, 218 $ git rebase -continue command, 218 $ git rebase fr en command, 217 $ git status -s, 217 problem, 215 staging a file, 218 Tracked files, 100 U Ubuntu Linux 12.4, 284 Unmodified files, 100 Unstaged files, 100 URL protocols, 325 V Virtual Linux directory creation, 281 guest system, 284 host system, 284 root s account access, 287 starting, stopping, and destroying, 285 synchronized folders, 287 Ubuntu Linux 12.4, 284 Vagrantfile contents, 283 $ vagrant ssh command, 282 $ vagrant up, 281 VirtualBox lists, 283 virtual host, SSH session, 286 virtual machine states, 285 Windows, 284 W, X, Y Wildcard characters, 81 Z Zipped archives,