[git/git.git] / Documentation / tutorial.txt
1 A short git tutorial
2 ====================
3 May 2005
6 Introduction
7 ------------
9 This is trying to be a short tutorial on setting up and using a git
10 archive, mainly because being hands-on and using explicit examples is
11 often the best way of explaining what is going on.
13 In normal life, most people wouldn't use the "core" git programs
14 directly, but rather script around them to make them more palatable.
15 Understanding the core git stuff may help some people get those scripts
16 done, though, and it may also be instructive in helping people
17 understand what it is that the higher-level helper scripts are actually
18 doing.
20 The core git is often called "plumbing", with the prettier user
21 interfaces on top of it called "porcelain". You may not want to use the
22 plumbing directly very often, but it can be good to know what the
23 plumbing does for when the porcelain isn't flushing...
26 Creating a git archive
27 ----------------------
29 Creating a new git archive couldn't be easier: all git archives start
30 out empty, and the only thing you need to do is find yourself a
31 subdirectory that you want to use as a working tree - either an empty
32 one for a totally new project, or an existing working tree that you want
33 to import into git.
35 For our first example, we're going to start a totally new archive from
36 scratch, with no pre-existing files, and we'll call it "git-tutorial".
37 To start up, create a subdirectory for it, change into that
38 subdirectory, and initialize the git infrastructure with "git-init-db":
40 mkdir git-tutorial
41 cd git-tutorial
42 git-init-db
44 to which git will reply
46 defaulting to local storage area
48 which is just git's way of saying that you haven't been doing anything
49 strange, and that it will have created a local .git directory setup for
50 your new project. You will now have a ".git" directory, and you can
51 inspect that with "ls". For your new empty project, ls should show you
52 three entries:
54 - a symlink called HEAD, pointing to "refs/heads/master"
56 Don't worry about the fact that the file that the HEAD link points to
57 doesn't even exist yet - you haven't created the commit that will
58 start your HEAD development branch yet.
60 - a subdirectory called "objects", which will contain all the git SHA1
61 objects of your project. You should never have any real reason to
62 look at the objects directly, but you might want to know that these
63 objects are what contains all the real _data_ in your repository.
65 - a subdirectory called "refs", which contains references to objects.
67 In particular, the "refs" subdirectory will contain two other
68 subdirectories, named "heads" and "tags" respectively. They do
69 exactly what their names imply: they contain references to any number
70 of different "heads" of development (aka "branches"), and to any
71 "tags" that you have created to name specific versions of your
72 repository.
74 One note: the special "master" head is the default branch, which is
75 why the .git/HEAD file was created as a symlink to it even if it
76 doesn't yet exist. Basically, the HEAD link is supposed to always
77 point to the branch you are working on right now, and you always
78 start out expecting to work on the "master" branch.
80 However, this is only a convention, and you can name your branches
81 anything you want, and don't have to ever even _have_ a "master"
82 branch. A number of the git tools will assume that .git/HEAD is
83 valid, though.
85 [ Implementation note: an "object" is identified by its 160-bit SHA1
86 hash, aka "name", and a reference to an object is always the 40-byte
87 hex representation of that SHA1 name. The files in the "refs"
88 subdirectory are expected to contain these hex references (usually
89 with a final '\n' at the end), and you should thus expect to see a
90 number of 41-byte files containing these references in this refs
91 subdirectories when you actually start populating your tree ]
93 You have now created your first git archive. Of course, since it's
94 empty, that's not very useful, so let's start populating it with data.
97 Populating a git archive
98 ------------------------
100 We'll keep this simple and stupid, so we'll start off with populating a
101 few trivial files just to get a feel for it.
103 Start off with just creating any random files that you want to maintain
104 in your git archive. We'll start off with a few bad examples, just to
105 get a feel for how this works:
107 echo "Hello World" > a
108 echo "Silly example" > b
110 you have now created two files in your working directory, but to
111 actually check in your hard work, you will have to go through two steps:
113 - fill in the "cache" aka "index" file with the information about your
114 working directory state
116 - commit that index file as an object.
118 The first step is trivial: when you want to tell git about any changes
119 to your working directory, you use the "git-update-cache" program. That
120 program normally just takes a list of filenames you want to update, but
121 to avoid trivial mistakes, it refuses to add new entries to the cache
122 (or remove existing ones) unless you explicitly tell it that you're
123 adding a new entry with the "--add" flag (or removing an entry with the
124 "--remove") flag.
126 So to populate the index with the two files you just created, you can do
128 git-update-cache --add a b
130 and you have now told git to track those two files.
132 In fact, as you did that, if you now look into your object directory,
133 you'll notice that git will have added two new objects to the object
134 store. If you did exactly the steps above, you should now be able to do
136 ls .git/objects/??/*
138 and see two files:
140 .git/objects/55/7db03de997c86a4a028e1ebd3a1ceb225be238
141 .git/objects/f2/4c74a2e500f5ee1332c86b94199f52b1d1d962
143 which correspond with the object with SHA1 names of 557db... and f24c7..
144 respectively.
146 If you want to, you can use "git-cat-file" to look at those objects, but
147 you'll have to use the object name, not the filename of the object:
149 git-cat-file -t 557db03de997c86a4a028e1ebd3a1ceb225be238
151 where the "-t" tells git-cat-file to tell you what the "type" of the
152 object is. Git will tell you that you have a "blob" object (ie just a
153 regular file), and you can see the contents with
155 git-cat-file "blob" 557db03de997c86a4a028e1ebd3a1ceb225be238
157 which will print out "Hello World". The object 557db... is nothing
158 more than the contents of your file "a".
160 [ Digression: don't confuse that object with the file "a" itself. The
161 object is literally just those specific _contents_ of the file, and
162 however much you later change the contents in file "a", the object we
163 just looked at will never change. Objects are immutable. ]
165 Anyway, as we mentioned previously, you normally never actually take a
166 look at the objects themselves, and typing long 40-character hex SHA1
167 names is not something you'd normally want to do. The above digression
168 was just to show that "git-update-cache" did something magical, and
169 actually saved away the contents of your files into the git content
170 store.
172 Updating the cache did something else too: it created a ".git/index"
173 file. This is the index that describes your current working tree, and
174 something you should be very aware of. Again, you normally never worry
175 about the index file itself, but you should be aware of the fact that
176 you have not actually really "checked in" your files into git so far,
177 you've only _told_ git about them.
179 However, since git knows about them, you can now start using some of the
180 most basic git commands to manipulate the files or look at their status.
182 In particular, let's not even check in the two files into git yet, we'll
183 start off by adding another line to "a" first:
185 echo "It's a new day for git" >> a
187 and you can now, since you told git about the previous state of "a", ask
188 git what has changed in the tree compared to your old index, using the
189 "git-diff-files" command:
191 git-diff-files
193 oops. That wasn't very readable. It just spit out its own internal
194 version of a "diff", but that internal version really just tells you
195 that it has noticed that "a" has been modified, and that the old object
196 contents it had have been replaced with something else.
198 To make it readable, we can tell git-diff-files to output the
199 differences as a patch, using the "-p" flag:
201 git-diff-files -p
203 which will spit out
205 diff --git a/a b/a
206 --- a/a
207 +++ b/a
208 @@ -1 +1,2 @@
209 Hello World
210 +It's a new day for git
212 ie the diff of the change we caused by adding another line to "a".
214 In other words, git-diff-files always shows us the difference between
215 what is recorded in the index, and what is currently in the working
216 tree. That's very useful.
218 A common shorthand for "git-diff-files -p" is to just write
220 git diff
222 which will do the same thing.
225 Committing git state
226 --------------------
228 Now, we want to go to the next stage in git, which is to take the files
229 that git knows about in the index, and commit them as a real tree. We do
230 that in two phases: creating a "tree" object, and committing that "tree"
231 object as a "commit" object together with an explanation of what the
232 tree was all about, along with information of how we came to that state.
234 Creating a tree object is trivial, and is done with "git-write-tree".
235 There are no options or other input: git-write-tree will take the
236 current index state, and write an object that describes that whole
237 index. In other words, we're now tying together all the different
238 filenames with their contents (and their permissions), and we're
239 creating the equivalent of a git "directory" object:
241 git-write-tree
243 and this will just output the name of the resulting tree, in this case
244 (if you have does exactly as I've described) it should be
246 3ede4ed7e895432c0a247f09d71a76db53bd0fa4
248 which is another incomprehensible object name. Again, if you want to,
249 you can use "git-cat-file -t 3ede4.." to see that this time the object
250 is not a "blob" object, but a "tree" object (you can also use
251 git-cat-file to actually output the raw object contents, but you'll see
252 mainly a binary mess, so that's less interesting).
254 However - normally you'd never use "git-write-tree" on its own, because
255 normally you always commit a tree into a commit object using the
256 "git-commit-tree" command. In fact, it's easier to not actually use
257 git-write-tree on its own at all, but to just pass its result in as an
258 argument to "git-commit-tree".
260 "git-commit-tree" normally takes several arguments - it wants to know
261 what the _parent_ of a commit was, but since this is the first commit
262 ever in this new archive, and it has no parents, we only need to pass in
263 the tree ID. However, git-commit-tree also wants to get a commit message
264 on its standard input, and it will write out the resulting ID for the
265 commit to its standard output.
267 And this is where we start using the .git/HEAD file. The HEAD file is
268 supposed to contain the reference to the top-of-tree, and since that's
269 exactly what git-commit-tree spits out, we can do this all with a simple
270 shell pipeline:
272 echo "Initial commit" | git-commit-tree $(git-write-tree) > .git/HEAD
274 which will say:
276 Committing initial tree 3ede4ed7e895432c0a247f09d71a76db53bd0fa4
278 just to warn you about the fact that it created a totally new commit
279 that is not related to anything else. Normally you do this only _once_
280 for a project ever, and all later commits will be parented on top of an
281 earlier commit, and you'll never see this "Committing initial tree"
282 message ever again.
284 Again, normally you'd never actually do this by hand. There is a
285 helpful script called "git commit" that will do all of this for you. So
286 you could have just writtten
288 git commit
290 instead, and it would have done the above magic scripting for you.
293 Making a change
294 ---------------
296 Remember how we did the "git-update-cache" on file "a" and then we
297 changed "a" afterward, and could compare the new state of "a" with the
298 state we saved in the index file?
300 Further, remember how I said that "git-write-tree" writes the contents
301 of the _index_ file to the tree, and thus what we just committed was in
302 fact the _original_ contents of the file "a", not the new ones. We did
303 that on purpose, to show the difference between the index state, and the
304 state in the working directory, and how they don't have to match, even
305 when we commit things.
307 As before, if we do "git-diff-files -p" in our git-tutorial project,
308 we'll still see the same difference we saw last time: the index file
309 hasn't changed by the act of committing anything. However, now that we
310 have committed something, we can also learn to use a new command:
311 "git-diff-cache".
313 Unlike "git-diff-files", which showed the difference between the index
314 file and the working directory, "git-diff-cache" shows the differences
315 between a committed _tree_ and either the the index file or the working
316 directory. In other words, git-diff-cache wants a tree to be diffed
317 against, and before we did the commit, we couldn't do that, because we
318 didn't have anything to diff against.
320 But now we can do
322 git-diff-cache -p HEAD
324 (where "-p" has the same meaning as it did in git-diff-files), and it
325 will show us the same difference, but for a totally different reason.
326 Now we're comparing the working directory not against the index file,
327 but against the tree we just wrote. It just so happens that those two
328 are obviously the same, so we get the same result.
330 Again, because this is a common operation, you can also just shorthand
331 it with
333 git diff HEAD
335 which ends up doing the above for you.
337 In other words, "git-diff-cache" normally compares a tree against the
338 working directory, but when given the "--cached" flag, it is told to
339 instead compare against just the index cache contents, and ignore the
340 current working directory state entirely. Since we just wrote the index
341 file to HEAD, doing "git-diff-cache --cached -p HEAD" should thus return
342 an empty set of differences, and that's exactly what it does.
344 [ Digression: "git-diff-cache" really always uses the index for its
345 comparisons, and saying that it compares a tree against the working
346 directory is thus not strictly accurate. In particular, the list of
347 files to compare (the "meta-data") _always_ comes from the index file,
348 regardless of whether the --cached flag is used or not. The --cached
349 flag really only determines whether the file _contents_ to be compared
350 come from the working directory or not.
352 This is not hard to understand, as soon as you realize that git simply
353 never knows (or cares) about files that it is not told about
354 explicitly. Git will never go _looking_ for files to compare, it
355 expects you to tell it what the files are, and that's what the index
356 is there for. ]
358 However, our next step is to commit the _change_ we did, and again, to
359 understand what's going on, keep in mind the difference between "working
360 directory contents", "index file" and "committed tree". We have changes
361 in the working directory that we want to commit, and we always have to
362 work through the index file, so the first thing we need to do is to
363 update the index cache:
365 git-update-cache a
367 (note how we didn't need the "--add" flag this time, since git knew
368 about the file already).
370 Note what happens to the different git-diff-xxx versions here. After
371 we've updated "a" in the index, "git-diff-files -p" now shows no
372 differences, but "git-diff-cache -p HEAD" still _does_ show that the
373 current state is different from the state we committed. In fact, now
374 "git-diff-cache" shows the same difference whether we use the "--cached"
375 flag or not, since now the index is coherent with the working directory.
377 Now, since we've updated "a" in the index, we can commit the new
378 version. We could do it by writing the tree by hand again, and
379 committing the tree (this time we'd have to use the "-p HEAD" flag to
380 tell commit that the HEAD was the _parent_ of the new commit, and that
381 this wasn't an initial commit any more), but you've done that once
382 already, so let's just use the helpful script this time:
384 git commit
386 which starts an editor for you to write the commit message and tells you
387 a bit about what you're doing.
389 Write whatever message you want, and all the lines that start with '#'
390 will be pruned out, and the rest will be used as the commit message for
391 the change. If you decide you don't want to commit anything after all at
392 this point (you can continue to edit things and update the cache), you
393 can just leave an empty message. Otherwise git-commit-script will commit
394 the change for you.
396 You've now made your first real git commit. And if you're interested in
397 looking at what git-commit-script really does, feel free to investigate:
398 it's a few very simple shell scripts to generate the helpful (?) commit
399 message headers, and a few one-liners that actually do the commit itself.
402 Checking it out
403 ---------------
405 While creating changes is useful, it's even more useful if you can tell
406 later what changed. The most useful command for this is another of the
407 "diff" family, namely "git-diff-tree".
409 git-diff-tree can be given two arbitrary trees, and it will tell you the
410 differences between them. Perhaps even more commonly, though, you can
411 give it just a single commit object, and it will figure out the parent
412 of that commit itself, and show the difference directly. Thus, to get
413 the same diff that we've already seen several times, we can now do
415 git-diff-tree -p HEAD
417 (again, "-p" means to show the difference as a human-readable patch),
418 and it will show what the last commit (in HEAD) actually changed.
420 More interestingly, you can also give git-diff-tree the "-v" flag, which
421 tells it to also show the commit message and author and date of the
422 commit, and you can tell it to show a whole series of diffs.
423 Alternatively, you can tell it to be "silent", and not show the diffs at
424 all, but just show the actual commit message.
426 In fact, together with the "git-rev-list" program (which generates a
427 list of revisions), git-diff-tree ends up being a veritable fount of
428 changes. A trivial (but very useful) script called "git-whatchanged" is
429 included with git which does exactly this, and shows a log of recent
430 activity.
432 To see the whole history of our pitiful little git-tutorial project, you
433 can do
435 git log
437 which shows just the log messages, or if we want to see the log together
438 with the associated patches use the more complex (and much more
439 powerful)
441 git-whatchanged -p --root
443 and you will see exactly what has changed in the repository over its
444 short history.
446 [ Side note: the "--root" flag is a flag to git-diff-tree to tell it to
447 show the initial aka "root" commit too. Normally you'd probably not
448 want to see the initial import diff, but since the tutorial project
449 was started from scratch and is so small, we use it to make the result
450 a bit more interesting ]
452 With that, you should now be having some inkling of what git does, and
453 can explore on your own.
456 [ Side note: most likely, you are not directly using the core
457 git Plumbing commands, but using Porcelain like Cogito on top
458 of it. Cogito works a bit differently and you usually do not
459 have to run "git-update-cache" yourself for changed files (you
460 do tell underlying git about additions and removals via
461 "cg-add" and "cg-rm" commands). Just before you make a commit
462 with "cg-commit", Cogito figures out which files you modified,
463 and runs "git-update-cache" on them for you. ]
466 Tagging a version
467 -----------------
469 In git, there's two kinds of tags, a "light" one, and a "signed tag".
471 A "light" tag is technically nothing more than a branch, except we put
472 it in the ".git/refs/tags/" subdirectory instead of calling it a "head".
473 So the simplest form of tag involves nothing more than
475 git tag my-first-tag
477 which just writes the current HEAD into the .git/refs/tags/my-first-tag
478 file, after which point you can then use this symbolic name for that
479 particular state. You can, for example, do
481 git diff my-first-tag
483 to diff your current state against that tag (which at this point will
484 obviously be an empty diff, but if you continue to develop and commit
485 stuff, you can use your tag as a "anchor-point" to see what has changed
486 since you tagged it.
488 A "signed tag" is actually a real git object, and contains not only a
489 pointer to the state you want to tag, but also a small tag name and
490 message, along with a PGP signature that says that yes, you really did
491 that tag. You create these signed tags with the "-s" flag to "git tag":
493 git tag -s <tagname>
495 which will sign the current HEAD (but you can also give it another
496 argument that specifies the thing to tag, ie you could have tagged the
497 current "mybranch" point by using "git tag <tagname> mybranch").
499 You normally only do signed tags for major releases or things
500 like that, while the light-weight tags are useful for any marking you
501 want to do - any time you decide that you want to remember a certain
502 point, just create a private tag for it, and you have a nice symbolic
503 name for the state at that point.
506 Copying archives
507 -----------------
509 Git archives are normally totally self-sufficient, and it's worth noting
510 that unlike CVS, for example, there is no separate notion of
511 "repository" and "working tree". A git repository normally _is_ the
512 working tree, with the local git information hidden in the ".git"
513 subdirectory. There is nothing else. What you see is what you got.
515 [ Side note: you can tell git to split the git internal information from
516 the directory that it tracks, but we'll ignore that for now: it's not
517 how normal projects work, and it's really only meant for special uses.
518 So the mental model of "the git information is always tied directly to
519 the working directory that it describes" may not be technically 100%
520 accurate, but it's a good model for all normal use ]
522 This has two implications:
524 - if you grow bored with the tutorial archive you created (or you've
525 made a mistake and want to start all over), you can just do simple
527 rm -rf git-tutorial
529 and it will be gone. There's no external repository, and there's no
530 history outside of the project you created.
532 - if you want to move or duplicate a git archive, you can do so. There
533 is "git clone" command, but if all you want to do is just to
534 create a copy of your archive (with all the full history that
535 went along with it), you can do so with a regular
536 "cp -a git-tutorial new-git-tutorial".
538 Note that when you've moved or copied a git archive, your git index
539 file (which caches various information, notably some of the "stat"
540 information for the files involved) will likely need to be refreshed.
541 So after you do a "cp -a" to create a new copy, you'll want to do
543 git-update-cache --refresh
545 to make sure that the index file is up-to-date in the new one.
547 Note that the second point is true even across machines. You can
548 duplicate a remote git archive with _any_ regular copy mechanism, be it
549 "scp", "rsync" or "wget".
551 When copying a remote repository, you'll want to at a minimum update the
552 index cache when you do this, and especially with other peoples
553 repositories you often want to make sure that the index cache is in some
554 known state (you don't know _what_ they've done and not yet checked in),
555 so usually you'll precede the "git-update-cache" with a
557 git-read-tree --reset HEAD
558 git-update-cache --refresh
560 which will force a total index re-build from the tree pointed to by HEAD
561 (it resets the index contents to HEAD, and then the git-update-cache
562 makes sure to match up all index entries with the checked-out files).
564 The above can also be written as simply
566 git reset
568 and in fact a lot of the common git command combinations can be scripted
569 with the "git xyz" interfaces, and you can learn things by just looking
570 at what the git-*-script scripts do ("git reset" is the above two lines
571 implemented in "git-reset-script", but some things like "git status" and
572 "git commit" are slightly more complex scripts around the basic git
573 commands).
575 NOTE! Many (most?) public remote repositories will not contain any of
576 the checked out files or even an index file, and will _only_ contain the
577 actual core git files. Such a repository usually doesn't even have the
578 ".git" subdirectory, but has all the git files directly in the
579 repository.
581 To create your own local live copy of such a "raw" git repository, you'd
582 first create your own subdirectory for the project, and then copy the
583 raw repository contents into the ".git" directory. For example, to
584 create your own copy of the git repository, you'd do the following
586 mkdir my-git
587 cd my-git
588 rsync -rL rsync://rsync.kernel.org/pub/scm/git/git.git/ my-git .git
590 followed by
592 git-read-tree HEAD
594 to populate the index. However, now you have populated the index, and
595 you have all the git internal files, but you will notice that you don't
596 actually have any of the _working_directory_ files to work on. To get
597 those, you'd check them out with
599 git-checkout-cache -u -a
601 where the "-u" flag means that you want the checkout to keep the index
602 up-to-date (so that you don't have to refresh it afterward), and the
603 "-a" flag means "check out all files" (if you have a stale copy or an
604 older version of a checked out tree you may also need to add the "-f"
605 flag first, to tell git-checkout-cache to _force_ overwriting of any old
606 files).
608 Again, this can all be simplified with
610 git clone rsync://rsync.kernel.org/pub/scm/git/git.git/ my-git
611 cd my-git
612 git checkout
614 which will end up doing all of the above for you.
616 You have now successfully copied somebody else's (mine) remote
617 repository, and checked it out.
620 Creating a new branch
621 ---------------------
623 Branches in git are really nothing more than pointers into the git
624 object space from within the ".git/refs/" subdirectory, and as we
625 already discussed, the HEAD branch is nothing but a symlink to one of
626 these object pointers.
628 You can at any time create a new branch by just picking an arbitrary
629 point in the project history, and just writing the SHA1 name of that
630 object into a file under .git/refs/heads/. You can use any filename you
631 want (and indeed, subdirectories), but the convention is that the
632 "normal" branch is called "master". That's just a convention, though,
633 and nothing enforces it.
635 To show that as an example, let's go back to the git-tutorial archive we
636 used earlier, and create a branch in it. You do that by simply just
637 saying that you want to check out a new branch:
639 git checkout -b mybranch
641 will create a new branch based at the current HEAD position, and switch
642 to it.
644 [ Side note: if you make the decision to start your new branch at some
645 other point in the history than the current HEAD, you can do so by
646 just telling "git checkout" what the base of the checkout would be.
647 In other words, if you have an earlier tag or branch, you'd just do
649 git checkout -b mybranch earlier-branch
651 and it would create the new branch "mybranch" at the earlier point,
652 and check out the state at that time. ]
654 You can always just jump back to your original "master" branch by doing
656 git checkout master
658 (or any other branch-name, for that matter) and if you forget which
659 branch you happen to be on, a simple
661 ls -l .git/HEAD
663 will tell you where it's pointing.
665 NOTE! Sometimes you may wish to create a new branch _without_ actually
666 checking it out and switching to it. If so, just use the command
668 git branch <branchname> [startingpoint]
670 which will simply _create_ the branch, but will not do anything further.
671 You can then later - once you decide that you want to actually develop
672 on that branch - switch to that branch with a regular "git checkout"
673 with the branchname as the argument.
676 Merging two branches
677 --------------------
679 One of the ideas of having a branch is that you do some (possibly
680 experimental) work in it, and eventually merge it back to the main
681 branch. So assuming you created the above "mybranch" that started out
682 being the same as the original "master" branch, let's make sure we're in
683 that branch, and do some work there.
685 git checkout mybranch
686 echo "Work, work, work" >> a
687 git commit a
689 Here, we just added another line to "a", and we used a shorthand for
690 both going a "git-update-cache a" and "git commit" by just giving the
691 filename directly to "git commit".
693 Now, to make it a bit more interesting, let's assume that somebody else
694 does some work in the original branch, and simulate that by going back
695 to the master branch, and editing the same file differently there:
697 git checkout master
699 Here, take a moment to look at the contents of "a", and notice how they
700 don't contain the work we just did in "mybranch" - because that work
701 hasn't happened in the "master" branch at all. Then do
703 echo "Play, play, play" >> a
704 echo "Lots of fun" >> b
705 git commit a b
707 since the master branch is obviously in a much better mood.
709 Now, you've got two branches, and you decide that you want to merge the
710 work done. Before we do that, let's introduce a cool graphical tool that
711 helps you view what's going on:
713 gitk --all
715 will show you graphically both of your branches (that's what the "--all"
716 means: normally it will just show you your current HEAD) and their
717 histories. You can also see exactly how they came to be from a common
718 source.
720 Anyway, let's exit gitk (^Q or the File menu), and decide that we want
721 to merge the work we did on the "mybranch" branch into the "master"
722 branch (which is currently our HEAD too). To do that, there's a nice
723 script called "git resolve", which wants to know which branches you want
724 to resolve and what the merge is all about:
726 git resolve HEAD mybranch "Merge work in mybranch"
728 where the third argument is going to be used as the commit message if
729 the merge can be resolved automatically.
731 Now, in this case we've intentionally created a situation where the
732 merge will need to be fixed up by hand, though, so git will do as much
733 of it as it can automatically (which in this case is just merge the "b"
734 file, which had no differences in the "mybranch" branch), and say:
736 Simple merge failed, trying Automatic merge
737 Auto-merging a.
738 merge: warning: conflicts during merge
739 ERROR: Merge conflict in a.
740 fatal: merge program failed
741 Automatic merge failed, fix up by hand
743 which is way too verbose, but it basically tells you that it failed the
744 really trivial merge ("Simple merge") and did an "Automatic merge"
745 instead, but that too failed due to conflicts in "a".
747 Not to worry. It left the (trivial) conflict in "a" in the same form you
748 should already be well used to if you've ever used CVS, so let's just
749 open "a" in our editor (whatever that may be), and fix it up somehow.
750 I'd suggest just making it so that "a" contains all four lines:
752 Hello World
753 It's a new day for git
754 Play, play, play
755 Work, work, work
757 and once you're happy with your manual merge, just do a
759 git commit a
761 which will very loudly warn you that you're now committing a merge
762 (which is correct, so never mind), and you can write a small merge
763 message about your adventures in git-merge-land.
765 After you're done, start up "gitk --all" to see graphically what the
766 history looks like. Notive that "mybranch" still exists, and you can
767 switch to it, and continue to work with it if you want to. The
768 "mybranch" branch will not contain the merge, but next time you merge it
769 from the "master" branch, git will know how you merged it, so you'll not
770 have to do _that_ merge again.
773 Merging external work
774 ---------------------
776 It's usually much more common that you merge with somebody else than
777 merging with your own branches, so it's worth pointing out that git
778 makes that very easy too, and in fact, it's not that different from
779 doing a "git resolve". In fact, a remote merge ends up being nothing
780 more than "fetch the work from a remote repository into a temporary tag"
781 followed by a "git resolve".
783 It's such a common thing to do that it's called "git pull", and you can
784 simply do
786 git pull <remote-repository>
788 and optionally give a branch-name for the remote end as a second
789 argument.
791 The "remote" repository can even be on the same machine. One of
792 the following notations can be used to name the repository to
793 pull from:
795 Rsync URL
796 rsync://remote.machine/path/to/repo.git/
798 HTTP(s) URL
799 http://remote.machine/path/to/repo.git/
802 git://remote.machine/path/to/repo.git/
803 remote.machine:/path/to/repo.git/
805 Local directory
806 /path/to/repo.git/
808 [ Side Note: currently, HTTP transport is slightly broken in
809 that when the remote repository is "packed" they do not always
810 work. But we have not talked about packing repository yet, so
811 let's not worry too much about it for now. ]
813 [ Digression: you could do without using any branches at all, by
814 keeping as many local repositories as you would like to have
815 branches, and merging between them with "git pull", just like
816 you merge between branches. The advantage of this approach is
817 that it lets you keep set of files for each "branch" checked
818 out and you may find it easier to switch back and forth if you
819 juggle multiple lines of development simultaneously. Of
820 course, you will pay the price of more disk usage to hold
821 multiple working trees, but disk space is cheap these days. ]
823 It is likely that you will be pulling from the same remote
824 repository from time to time. As a short hand, you can store
825 the remote repository URL in a file under .git/branches/
826 directory, like this:
828 mkdir -p .git/branches
829 echo rsync://kernel.org/pub/scm/git/git.git/ \
830 >.git/branches/linus
832 and use the filenae to "git pull" instead of the full URL.
833 The contents of a file under .git/branches can even be a prefix
834 of a full URL, like this:
836 echo rsync://kernel.org/pub/.../jgarzik/
837 >.git/branches/jgarzik
839 Examples.
841 (1) git pull linus
842 (2) git pull linus tag v0.99.1
843 (3) git pull jgarzik/netdev-2.6.git/ e100
845 the above are equivalent to:
847 (1) git pull rsync://kernel.org/pub/scm/git/git.git/ HEAD
848 (2) git pull rsync://kernel.org/pub/scm/git/git.git/ tag v0.99.1
849 (3) git pull rsync://kernel.org/pub/.../jgarzik/netdev-2.6.git e100
852 Publishing your work
853 --------------------
855 So we can use somebody else's work from a remote repository; but
856 how can _you_ prepare a repository to let other people pull from
857 it?
859 Your do your real work in your working directory that has your
860 primary repository hanging under it as its ".git" subdirectory.
861 You _could_ make that repository accessible remotely and ask
862 people to pull from it, but in practice that is not the way
863 things are usually done. A recommended way is to have a public
864 repository, make it reachable by other people, and when the
865 changes you made in your primary working directory are in good
866 shape, update the public repository from it. This is often
867 called "pushing".
869 [ Side note: this public repository could further be mirrored,
870 and that is how kernel.org git repositories are done. ]
872 Publishing the changes from your local (private) repository to
873 your remote (public) repository requires a write privilege on
874 the remote machine. You need to have an SSH account there to
875 run a single command, "git-receive-pack".
877 First, you need to create an empty repository on the remote
878 machine that will house your public repository. This empty
879 repository will be populated and be kept up-to-date by pushing
880 into it later. Obviously, this repository creation needs to be
881 done only once.
883 [ Digression: "git push" uses a pair of programs,
884 "git-send-pack" on your local machine, and "git-receive-pack"
885 on the remote machine. The communication between the two over
886 the network internally uses an SSH connection. ]
888 Your private repository's GIT directory is usually .git, but
889 your public repository is often named after the project name,
890 i.e. "<project>.git". Let's create such a public repository for
891 project "my-git". After logging into the remote machine, create
892 an empty directory:
894 mkdir my-git.git
896 Then, make that directory into a GIT repository by running
897 git-init-db, but this time, since it's name is not the usual
898 ".git", we do things slightly differently:
900 GIT_DIR=my-git.git git-init-db
902 Make sure this directory is available for others you want your
903 changes to be pulled by via the transport of your choice. Also
904 you need to make sure that you have the "git-receive-pack"
905 program on the $PATH.
907 [ Side note: many installations of sshd do not invoke your shell
908 as the login shell when you directly run programs; what this
909 means is that if your login shell is bash, only .bashrc is
910 read and not .bash_profile. As a workaround, make sure
911 .bashrc sets up $PATH so that you can run 'git-receive-pack'
912 program. ]
914 Your "public repository" is now ready to accept your changes.
915 Come back to the machine you have your private repository. From
916 there, run this command:
918 git push <public-host>:/path/to/my-git.git master
920 This synchronizes your public repository to match the named
921 branch head (i.e. "master" in this case) and objects reachable
922 from them in your current repository.
924 As a real example, this is how I update my public git
925 repository. Kernel.org mirror network takes care of the
926 propagation to other publicly visible machines:
928 git push master.kernel.org:/pub/scm/git/git.git/
931 [ Digression: your GIT "public" repository people can pull from
932 is different from a public CVS repository that lets read-write
933 access to multiple developers. It is a copy of _your_ primary
934 repository published for others to use, and you should not
935 push into it from more than one repository (this means, not
936 just disallowing other developers to push into it, but also
937 you should push into it from a single repository of yours).
938 Sharing the result of work done by multiple people are always
939 done by pulling (i.e. fetching and merging) from public
940 repositories of those people. Typically this is done by the
941 "project lead" person, and the resulting repository is
942 published as the public repository of the "project lead" for
943 everybody to base further changes on. ]
946 Packing your repository
947 -----------------------
949 Earlier, we saw that one file under .git/objects/??/ directory
950 is stored for each git object you create. This representation
951 is convenient and efficient to create atomically and safely, but
952 not so to transport over the network. Since git objects are
953 immutable once they are created, there is a way to optimize the
954 storage by "packing them together". The command
956 git repack
958 will do it for you. If you followed the tutorial examples, you
959 would have accumulated about 17 objects in .git/objects/??/
960 directories by now. "git repack" tells you how many objects it
961 packed, and stores the packed file in .git/objects/pack
962 directory.
964 [ Side Note: you will see two files, pack-*.pack and pack-*.idx,
965 in .git/objects/pack directory. They are closely related to
966 each other, and if you ever copy them by hand to a different
967 repository for whatever reason, you should make sure you copy
968 them together. The former holds all the data from the objects
969 in the pack, and the latter holds the index for random
970 access. ]
972 If you are paranoid, running "git-verify-pack" command would
973 detect if you have a corrupt pack, but do not worry too much.
974 Our programs are always perfect ;-).
976 Once you have packed objects, you do not need to leave the
977 unpacked objects that are contained in the pack file anymore.
979 git prune-packed
981 would remove them for you.
983 You can try running "find .git/objects -type f" before and after
984 you run "git prune-packed" if you are curious.
986 [ Side Note: as we already mentioned, "git pull" is broken for
987 some transports dealing with packed repositories right now, so
988 do not run "git prune-packed" if you plan to give "git pull"
989 access via HTTP transport for now. ]
991 If you run "git repack" again at this point, it will say
992 "Nothing to pack". Once you continue your development and
993 accumulate the changes, running "git repack" again will create a
994 new pack, that contains objects created since you packed your
995 archive the last time. We recommend that you pack your project
996 soon after the initial import (unless you are starting your
997 project from scratch), and then run "git repack" every once in a
998 while, depending on how active your project is.
1000 When a repository is synchronized via "git push" and "git pull",
1001 objects packed in the source repository is usually stored
1002 unpacked in the destination, unless rsync transport is used.
1005 Working with Others
1006 -------------------
1008 Although git is a truly distributed system, it is often
1009 convenient to organize your project with an informal hierarchy
1010 of developers. Linux kernel development is run this way. There
1011 is a nice illustration (page 17, "Merges to Mainline") in Randy
1012 Dunlap's presentation (http://tinyurl.com/a2jdg).
1014 It should be stressed that this hierarchy is purely "informal".
1015 There is nothing fundamental in git that enforces the "chain of
1016 patch flow" this hierarchy implies. You do not have to pull
1017 from only one remote repository.
1020 A recommended workflow for a "project lead" goes like this:
1022 (1) Prepare your primary repository on your local machine. Your
1023 work is done there.
1025 (2) Prepare a public repository accessible to others.
1027 (3) Push into the public repository from your primary
1028 repository.
1030 (4) "git repack" the public repository. This establishes a big
1031 pack that contains the initial set of objects as the
1032 baseline, and possibly "git prune-packed" if the transport
1033 used for pulling from your repository supports packed
1034 repositories.
1036 (5) Keep working in your primary repository. Your changes
1037 include modifications of your own, patches you receive via
1038 e-mails, and merges resulting from pulling the "public"
1039 repositories of your "subsystem maintainers".
1041 You can repack this private repository whenever you feel
1042 like.
1044 (6) Push your changes to the public repository, and announce it
1045 to the public.
1047 (7) Every once in a while, "git repack" the public repository.
1048 Go back to step (5) and continue working.
1051 A recommended work cycle for a "subsystem maintainer" that works
1052 on that project and has own "public repository" goes like this:
1054 (1) Prepare your work repository, by "git clone" the public
1055 repository of the "project lead". The URL used for the
1056 initial cloning is stored in .git/branches/origin.
1058 (2) Prepare a public repository accessible to others.
1060 (3) Copy over the packed files from "project lead" public
1061 repository to your public repository by hand; this part is
1062 currently not automated.
1064 (4) Push into the public repository from your primary
1065 repository. Run "git repack", and possibly "git
1066 prune-packed" if the transport used for pulling from your
1067 repository supports packed repositories.
1069 (5) Keep working in your primary repository. Your changes
1070 include modifications of your own, patches you receive via
1071 e-mails, and merges resulting from pulling the "public"
1072 repositories of your "project lead" and possibly your
1073 "sub-subsystem maintainers".
1075 You can repack this private repository whenever you feel
1076 like.
1078 (6) Push your changes to your public repository, and ask your
1079 "project lead" and possibly your "sub-subsystem
1080 maintainers" to pull from it.
1082 (7) Every once in a while, "git repack" the public repository.
1083 Go back to step (5) and continue working.
1086 A recommended work cycle for an "individual developer" who does
1087 not have a "public" repository is somewhat different. It goes
1088 like this:
1090 (1) Prepare your work repository, by "git clone" the public
1091 repository of the "project lead" (or a "subsystem
1092 maintainer", if you work on a subsystem). The URL used for
1093 the initial cloning is stored in .git/branches/origin.
1095 (2) Do your work there. Make commits.
1097 (3) Run "git fetch origin" from the public repository of your
1098 upstream every once in a while. This does only the first
1099 half of "git pull" but does not merge. The head of the
1100 public repository is stored in .git/refs/heads/origin.
1102 (4) Use "git cherry origin" to see which ones of your patches
1103 were accepted, and/or use "git rebase origin" to port your
1104 unmerged changes forward to the updated upstream.
1106 (5) Use "git format-patch origin" to prepare patches for e-mail
1107 submission to your upstream and send it out. Go back to
1108 step (2) and continue.
1111 [ to be continued.. cvsimports ]