pull: add --ff-only to the help text
commitef93e3a49c3b2b62c6c450f862ce1626bc8dab54
authorDavid Aguilar <davvid@gmail.com>
Wed, 15 Jan 2014 23:18:39 +0000 (15 15:18 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 16 Jan 2014 00:01:07 +0000 (15 16:01 -0800)
tree848f2f09d74e7b749d1b7f2bedd9ddf99f71c27e
parentb814da891e8261b909fc5d9fb07b4e8b13989c2d
pull: add --ff-only to the help text

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-pull.sh