summaryrefslogtreecommitdiff
path: root/blob.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-11-30 16:23:50 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-12-01 12:45:34 -0800
commitb81e00a965c62ca72a4b9db425ee173de147808d (patch)
tree2de88ec95a37e4b5ab5251195470746edc331dd3 /blob.h
parentGIT 1.6.5 (diff)
downloadtgif-b81e00a965c62ca72a4b9db425ee173de147808d.tar.xz
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>
Diffstat (limited to 'blob.h')
0 files changed, 0 insertions, 0 deletions