![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index e1be6cc0bcfded709bbd57a3ccd73e5ed241dd18..d9c5a131250c9d9bf830013dafa1f1d6f2c2a813 100644 (file)
-----------
Reads the tree information given by <tree-ish> into the directory cache,
but does not actually *update* any of the files it "caches". (see:
-----------
Reads the tree information given by <tree-ish> into the directory cache,
but does not actually *update* any of the files it "caches". (see:
-git-checkout-cache)
+git-checkout-index)
Optionally, it can merge a tree into the cache, perform a
fast-forward (i.e. 2-way) merge, or a 3-way merge, with the -m
Optionally, it can merge a tree into the cache, perform a
fast-forward (i.e. 2-way) merge, or a 3-way merge, with the -m
cache's stat()s take precedence over the merged tree's).
That means that if you do a "git-read-tree -m <newtree>" followed by a
cache's stat()s take precedence over the merged tree's).
That means that if you do a "git-read-tree -m <newtree>" followed by a
-"git-checkout-cache -f -u -a", the "git-checkout-cache" only checks out
+"git-checkout-index -f -u -a", the "git-checkout-index" only checks out
the stuff that really changed.
This is used to avoid unnecessary false hits when "git-diff-files" is
the stuff that really changed.
This is used to avoid unnecessary false hits when "git-diff-files" is
When this form of git-read-tree returns successfully, you can
see what "local changes" you made are carried forward by running
When this form of git-read-tree returns successfully, you can
see what "local changes" you made are carried forward by running
-"git-diff-cache --cached $M". Note that this does not
-necessarily match "git-diff-cache --cached $H" would have
+"git-diff-index --cached $M". Note that this does not
+necessarily match "git-diff-index --cached $H" would have
produced before such a two tree merge. This is because of cases
18 and 19 --- if you already had the changes in $M (e.g. maybe
produced before such a two tree merge. This is because of cases
18 and 19 --- if you already had the changes in $M (e.g. maybe
-you picked it up via e-mail in a patch form), "git-diff-cache
+you picked it up via e-mail in a patch form), "git-diff-index
--cached $H" would have told you about the change before this
--cached $H" would have told you about the change before this
-merge, but it would not show in "git-diff-cache --cached $M"
+merge, but it would not show in "git-diff-index --cached $M"
output after two-tree merge.
output after two-tree merge.
matching "stage1" entry if it exists too. .. all the normal
trivial rules ..
matching "stage1" entry if it exists too. .. all the normal
trivial rules ..
-You would normally use "git-merge-cache" with supplied
-"git-merge-one-file-script" to do this last step. The script
+You would normally use "git-merge-index" with supplied
+"git-merge-one-file" to do this last step. The script
does not touch the files in the work tree, and the entire merge
happens in the index file. In other words, there is no need to
worry about what is in the working directory, since it is never
does not touch the files in the work tree, and the entire merge
happens in the index file. In other words, there is no need to
worry about what is in the working directory, since it is never
commited last to your repository:
$ JC=`cat .git/HEAD`
commited last to your repository:
$ JC=`cat .git/HEAD`
- $ git-checkout-cache -f -u -a $JC
+ $ git-checkout-index -f -u -a $JC
-You do random edits, without running git-update-cache. And then
+You do random edits, without running git-update-index. And then
you notice that the tip of your "upstream" tree has advanced
since you pulled from him:
you notice that the tip of your "upstream" tree has advanced
since you pulled from him:
- $ git-fetch-script rsync://.... linus
+ $ git-fetch rsync://.... linus
$ LT=`cat .git/MERGE_HEAD`
Your work tree is still based on your HEAD ($JC), but you have
$ LT=`cat .git/MERGE_HEAD`
Your work tree is still based on your HEAD ($JC), but you have
then does the right thing. So with the following sequence:
$ git-read-tree -m -u `git-merge-base $JC $LT` $JC $LT
then does the right thing. So with the following sequence:
$ git-read-tree -m -u `git-merge-base $JC $LT` $JC $LT
- $ git-merge-cache git-merge-one-file-script -a
+ $ git-merge-index git-merge-one-file -a
$ echo "Merge with Linus" | \
git-commit-tree `git-write-tree` -p $JC -p $LT
$ echo "Merge with Linus" | \
git-commit-tree `git-write-tree` -p $JC -p $LT