[PATCH] Reference technical/trivial-merge.txt in git-read-tree documentation

[PATCH] Reference technical/trivial-merge.txt in git-read-tree documentation

[Petr Baudis]

That file, with the so valuable (and so confusing) tables describing
the precise resolution rules git-read-tree follows, silently sat in
the corner and almost noone knew about it (well, I didn't, at least).
This references it from the git-read-tree documentation, so that there
is some chance that interested people will find it.

Signed-off-by: Petr Baudis <pasky@suse.cz>
---

 Documentation/git-read-tree.txt |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt
index 7db5fb5..ff17bad 100644
--- a/Documentation/git-read-tree.txt
+++ b/Documentation/git-read-tree.txt
@@ -55,6 +55,12 @@ merge, a single tree merge if only 1 tre
 fast-forward merge with 2 trees, or a 3-way merge if 3 trees are
 provided.
 
+The detailed listing of the precise automatic resolution rules
+git-read-tree follows can be found in 'technical/trivial-merge.txt'.
+It is in part redundant with what you will find below since the
+fellow documenters cannot decide which of the descriptions is more
+confusing and remove the other one.
+
 
 Single Tree Merge
 ~~~~~~~~~~~~~~~~~

Re: [PATCH] Reference technical/trivial-merge.txt in git-read-tree documentation

[Petr Baudis]

Dear diary, on Fri, Nov 11, 2005 at 09:51:40PM CET, I got a letter
where Petr Baudis <pasky@suse.cz> said that...
> That file, with the so valuable (and so confusing) tables describing
> the precise resolution rules git-read-tree follows, silently sat in
> the corner and almost noone knew about it (well, I didn't, at least).
> This references it from the git-read-tree documentation, so that there
> is some chance that interested people will find it.
> 
> Signed-off-by: Petr Baudis <pasky@suse.cz>

Any gripes, or just forgotten?

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
VI has two modes: the one in which it beeps and the one in which
it doesn't.

Re: [PATCH] Reference technical/trivial-merge.txt in git-read-tree documentation

[Junio C Hamano]

Petr Baudis <pasky@suse.cz> writes:

> Dear diary, on Fri, Nov 11, 2005 at 09:51:40PM CET, I got a letter
> where Petr Baudis <pasky@suse.cz> said that...
>> That file, with the so valuable (and so confusing) tables describing
>> the precise resolution rules git-read-tree follows, silently sat in
>> the corner and almost noone knew about it (well, I didn't, at least).
>> This references it from the git-read-tree documentation, so that there
>> is some chance that interested people will find it.
>> 
>> Signed-off-by: Petr Baudis <pasky@suse.cz>
>
> Any gripes, or just forgotten?

What happened was that I thought I'd apply after rewording the
sarcasm and maybe moving the existing table to the one in
technical/ (or just removing the old table), and forgot about it.

One thing I do not like the table in technical/ is that it is
harder to read as the "case table" than the original.
Admittedly, it is meant to describe more complex situation, so
it _is_ harder to understand, but a major difference is that the
original table was designed to decribe things orthogonally and
you did not have to read from top to bottom (any situation would
have fallen in one case no matter what order you checked the
condition for each case), while the updated table in technical/
_must_ be read from top to bottom and take the first match, and
that was what made me feel reluctant to remove the existing one
from the original document.