[PATCH] Reference technical/trivial-merge.txt in git-read-tree documentation
- From
Petr Baudis <pasky@suse.cz>
- Date
- Nov 11, 2005, 20:51 UTC
- Message-ID
- <20051111205140.5719.68724.stgit@machine.or.cz>
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 ~~~~~~~~~~~~~~~~~