Bug 17635

Summary: manpage doesn't tell about "subtree" merge strategy
Product: Branch 4.0 Reporter: Ivan Zakharyaschev <imz>
Component: git-coreAssignee: Nobody's working on this, feel free to take it <nobody>
Status: CLOSED WONTFIX QA Contact: Q.A. 4.0 <qa-4.0>
Severity: minor    
Priority: P2    
Version: 4.0   
Hardware: all   
OS: Linux   

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, перевесить на текущие ветки или сизиф.