From: Jonathan Nieder Date: Mon, 11 Jan 2010 08:27:55 GMT Subject: [PATCH/RFC 1/6] Documentation: clarify one-line description for merge Message-ID: <20100111082755.GA23806@progeny.tock> In-Reply-To: <20100111082123.GA23742@progeny.tock> The 'git merge' command is generally not used to tie completely independent projects together (though it can be used to do that) but to reconcile branches of development that may have diverged. Try to make this clearer in its one-line description. Cc: Petr Baudis Cc: Junio C Hamano Cc: Thomas Rast Signed-off-by: Jonathan Nieder --- I am not sure this is an improvement at all. Mostly I wanted to convey the idea of code forks being reconciled, but the resulting phrase is not nearly as nice. Documentation/git-merge.txt | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index e886c2e..394ad0a 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -3,8 +3,7 @@ git-merge(1) NAME ---- -git-merge - Join two or more development histories together - +git-merge - Re-join diverging branches of development SYNOPSIS -------- -- 1.6.6