diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2005-08-05 17:05:02 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-08-05 23:07:00 -0700 |
| commit | 2c6e4771959dbe8116f39587d912f1215c06cd0d (patch) | |
| tree | 4a0507fb450fc5c74ecc489701917f188a0a5077 /Documentation/git-read-tree.txt | |
| parent | eca35ecdcaa1448de8cc9ec64590f47a9012264a (diff) | |
| download | git-2c6e4771959dbe8116f39587d912f1215c06cd0d.tar.gz | |
[PATCH] Assorted documentation patches
[jc: Johannes spent time and effort to see how consistent our
use of terminilogy is, and as a byproduct made these corrections
not related to the terminology unification. I really appreciate
it.]
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-read-tree.txt')
| -rw-r--r-- | Documentation/git-read-tree.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt index 7665946f80..e1be6cc0bc 100644 --- a/Documentation/git-read-tree.txt +++ b/Documentation/git-read-tree.txt @@ -41,7 +41,7 @@ OPTIONS Merging ------- -If '-m' is specified, "git-read-tree" can performs 3 kinds of +If '-m' is specified, "git-read-tree" can perform 3 kinds of merge, a single tree merge if only 1 tree is given, a fast-forward merge with 2 trees, or a 3-way merge if 3 trees are provided. @@ -51,9 +51,9 @@ Single Tree Merge ~~~~~~~~~~~~~~~~~ If only 1 tree is specified, git-read-tree operates as if the user did not specify '-m', except that if the original cache has an entry for a -given pathname; and the contents of the path matches with the tree +given pathname, and the contents of the path matches with the tree being read, the stat info from the cache is used. (In other words, the -cache's stat()s take precedence over the merged tree's) +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 @@ -184,7 +184,7 @@ populated. Here is an outline of how the algorithm works: automatically collapse to "merged" state by git-read-tree. - a file that has _any_ difference what-so-ever in the three trees - will stay as separate entries in the index. It's up to "script + will stay as separate entries in the index. It's up to "porcelain policy" to determine how to remove the non-0 stages, and insert a merged version. |