projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
applypatch: use "index" lines not "applies-to".
[git.git]
/
Documentation
/
tutorial.txt
diff --git
a/Documentation/tutorial.txt
b/Documentation/tutorial.txt
index
95ed852
..
e2dfb00
100644
(file)
--- a/
Documentation/tutorial.txt
+++ b/
Documentation/tutorial.txt
@@
-131,7
+131,7
@@
actually check in your hard work, you will have to go through two steps:
The first step is trivial: when you want to tell git about any changes
to your working tree, you use the `git-update-index` program. That
program normally just takes a list of filenames you want to update, but
The first step is trivial: when you want to tell git about any changes
to your working tree, you use the `git-update-index` program. That
program normally just takes a list of filenames you want to update, but
-to avoid trivial mistakes, it refuses to add new entries to the
cache
+to avoid trivial mistakes, it refuses to add new entries to the
index
(or remove existing ones) unless you explicitly tell it that you're
adding a new entry with the `\--add` flag (or removing an entry with the
`\--remove`) flag.
(or remove existing ones) unless you explicitly tell it that you're
adding a new entry with the `\--add` flag (or removing an entry with the
`\--remove`) flag.
@@
-199,7
+199,7
@@
was just to show that `git-update-index` did something magical, and
actually saved away the contents of your files into the git object
database.
actually saved away the contents of your files into the git object
database.
-Updating the
cache
did something else too: it created a `.git/index`
+Updating the
index
did something else too: it created a `.git/index`
file. This is the index that describes your current working tree, and
something you should be very aware of. Again, you normally never worry
about the index file itself, but you should be aware of the fact that
file. This is the index that describes your current working tree, and
something you should be very aware of. Again, you normally never worry
about the index file itself, but you should be aware of the fact that
@@
-440,7
+440,7
@@
a bit about what you have done.
Write whatever message you want, and all the lines that start with '#'
will be pruned out, and the rest will be used as the commit message for
the change. If you decide you don't want to commit anything after all at
Write whatever message you want, and all the lines that start with '#'
will be pruned out, and the rest will be used as the commit message for
the change. If you decide you don't want to commit anything after all at
-this point (you can continue to edit things and update the
cache
), you
+this point (you can continue to edit things and update the
index
), you
can just leave an empty message. Otherwise `git commit` will commit
the change for you.
can just leave an empty message. Otherwise `git commit` will commit
the change for you.
@@
-1534,7
+1534,10
@@
on that project and has an own "public repository" goes like this:
the "project lead" person does.
3. Copy over the packed files from "project lead" public
the "project lead" person does.
3. Copy over the packed files from "project lead" public
- repository to your public repository.
+ repository to your public repository, unless the "project
+ lead" repository lives on the same machine as yours. In the
+ latter case, you can use `objects/info/alternates` file to
+ point at the repository you are borrowing from.
4. Push into the public repository from your primary
repository. Run `git repack`, and possibly `git prune` if the
4. Push into the public repository from your primary
repository. Run `git repack`, and possibly `git prune` if the