projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b6c9fb5) | patch
git-merge: document but discourage the historical syntax
authorJunio C Hamano <gitster@pobox.com>
Tue, 30 Oct 2007 18:54:11 +0000 (11:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 30 Oct 2007 23:33:55 +0000 (16:33 -0700)
commitdee48c3c7ed7f7a32a524e8a492c6bc4e3c1c78d
tree54c57ac2544d2fbbe9a2d1d34c676c3d31625548tree | snapshot
parentb6c9fb5100f8cd4081f1c6df5aea7335a11e9659commit | diff
git-merge: document but discourage the historical syntax

Historically "git merge" took its command line arguments in a
rather strange order.  Document the historical syntax, and also
document clearly that it is not encouraged in new scripts.

There is no reason to deprecate the historical syntax, as the
current code can sanely tell which syntax the caller is using,
and existing scripts by people do use the historical syntax.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-merge.txt diff | blob | history
Git—the stupid content tracker