Bug 17635 - manpage doesn't tell about "subtree" merge strategy
Summary: manpage doesn't tell about "subtree" merge strategy
Status: CLOSED WONTFIX
Alias: None
Product: Branch 4.0
Classification: Distributions
Component: git-core (show other bugs)
Version: 4.0
Hardware: all Linux
: P2 minor
Assignee: Nobody's working on this, feel free to take it
QA Contact: Q.A. 4.0
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2008-10-21 00:04 MSD by Ivan Zakharyaschev
Modified: 2014-11-05 20:16 MSK (History)
0 users

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Ivan Zakharyaschev 2008-10-21 00:04:04 MSD 
git-core-1.5.3.8-alt1 from OfficeServer 4.0.0

The "subtree" merge strategy is included in this release:

$ fgrep -i subtree /usr/share/doc/git-1.5.3.8/RelNotes*
/usr/share/doc/git-1.5.3.8/RelNotes-1.5.2.txt:  - "subtree" merge strategy allows another project to be merged in as
$ 

but the manpage is not updated accordingly, it says nothing about it:

$ man git-merge | fgrep -i subtree
$
Comment 1 Dmitry V. Levin 2008-10-21 02:05:15 MSD 
JFYI: already fixed in Sisyphus (git-core-1.5.6.5-alt2).
Comment 2 Michael Shigorin 2014-11-05 20:16:51 MSK 
В 4.0/branch исправления не будут вноситься уже технически (заглушена очередь на сборку), поэтому прошу ошибки, актуальные для sisyphus/p7/t7, перевесить на текущие ветки или сизиф.