git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH] Documentation/git-merge: document subtree strategy.

From
Miklos Vajna <vmiklos@frugalware.org>
Date
Mar 18, 2008, 12:26 UTC
Message-ID
<20080318122643.GC15297@genesis.frugalware.org>

There was already some documentation about subtree under Documentation/howto but it was missing from git-merge manpage.

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
---
Based on the commit message of 68faf68938ee943fc251c702f2027e4dfda354db.
 Documentation/merge-strategies.txt |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt
index 7df0266..1276f85 100644
--- a/Documentation/merge-strategies.txt
+++ b/Documentation/merge-strategies.txt
@@ -33,3 +33,10 @@ ours::
 	merge is always the current branch head.  It is meant to
 	be used to supersede old development history of side
 	branches.
+
+subtree::
+	This is a modified recursive strategy. When merging trees A and
+	B, if B corresponds to a subtree of A, B is first adjusted to
+	match the tree structure of A, instead of reading the trees at
+	the same level. This adjustment is also done to the common
+	ancestor tree.

-- 
1.5.4.3
Message 1 of 1 in “Documentation/git-merge: document subtree strategy.”
  1. Documentation/git-merge: document subtree strategy.Miklos Vajna, Mar 18, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.