From: Sergey Organov <sorga...@gmail.com> Old description not only raised the question of why the tool is called git-merge rather than git-join, but "join histories" also sounds like very simple operation, something like what "git-merge -s ours" does.
Signed-off-by: Sergey Organov <sorga...@gmail.com> --- Documentation/git-merge.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 216d2f4..cc0329d 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -3,7 +3,8 @@ git-merge(1) NAME ---- -git-merge - Join two or more development histories together + +git-merge - Merge one or more branches to the current branch SYNOPSIS -- 2.10.0.1.g57b01a3
