Code

core-tutorial: Use new syntax for git-merge.
authorSergei Organov <osv@javad.com>
Tue, 30 Oct 2007 19:54:02 +0000 (22:54 +0300)
committerJunio C Hamano <gitster@pobox.com>
Tue, 30 Oct 2007 23:35:07 +0000 (16:35 -0700)
commitba17892ddc85c0ffe8fecd600c29cb38ec7e5587
tree8e7f67fa3de59d630ef83cbd5e89155ecc1d1117
parentdee48c3c7ed7f7a32a524e8a492c6bc4e3c1c78d
core-tutorial: Use new syntax for git-merge.

"git-merge <msg> HEAD <other branches>" is still supported but
we shouldn't encourage its use.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/core-tutorial.txt