From: Miklos Vajna <vmiklos@frugalware.org>
Date: Tue, 18 Mar 2008 12:26:43 +0000 (+0100)
Subject: Documentation/git-merge: document subtree strategy.
X-Git-Tag: v1.5.5-rc1~14
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/02b00e16bb372fd13e1ac440e9fbafd223d43af0?ds=inline;hp=02b00e16bb372fd13e1ac440e9fbafd223d43af0

Documentation/git-merge: document subtree strategy.

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---