| commit | b81e00a965c62ca72a4b9db425ee173de147808d | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 1 Dec 2009 00:23:50 +0000 (30 16:23 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 1 Dec 2009 20:45:34 +0000 (1 12:45 -0800) | ||
| tree | 2de88ec95a37e4b5ab5251195470746edc331dd3 | treesnapshot (tar.gz zip) |
| parent | 78d553b7d7b269bb22ebd8b1198657c37484a3a0 | commitdiff |
git-merge: a deprecation notice of the ancient command line syntax
The ancient form of git merge command used in the original sample script
has been copied from Linus and are still found everywhere, I think, and
people may still have it in their scripts, but on the other hand, it is so
unintuitive that even people reasonably familiar with git are surprised by
accidentally triggering the support to parse this ancient form.
Gently nudge people to upgrade their script to more recent and readable
style for eventual removal of the original syntax.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The ancient form of git merge command used in the original sample script
has been copied from Linus and are still found everywhere, I think, and
people may still have it in their scripts, but on the other hand, it is so
unintuitive that even people reasonably familiar with git are surprised by
accidentally triggering the support to parse this ancient form.
Gently nudge people to upgrade their script to more recent and readable
style for eventual removal of the original syntax.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin-merge.c | diffblobblamehistory |