projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
s/checkout-cache/checkout-index/g for Documentation/git-ls-files.txt
[git.git]
/
Documentation
/
git-read-tree.txt
diff --git
a/Documentation/git-read-tree.txt
b/Documentation/git-read-tree.txt
index
0639bd0
..
5653bac
100644
(file)
--- a/
Documentation/git-read-tree.txt
+++ b/
Documentation/git-read-tree.txt
@@
-84,10
+84,10
@@
fast forward situation).
When two trees are specified, the user is telling git-read-tree
the following:
When two trees are specified, the user is telling git-read-tree
the following:
-
(1)
The current index and work tree is derived from $H, but
+
1.
The current index and work tree is derived from $H, but
the user may have local changes in them since $H;
the user may have local changes in them since $H;
-
(2)
The user wants to fast-forward to $M.
+
2.
The user wants to fast-forward to $M.
In this case, the "git-read-tree -m $H $M" command makes sure
that no local change is lost as the result of this "merge".
In this case, the "git-read-tree -m $H $M" command makes sure
that no local change is lost as the result of this "merge".