From: David Aguilar Date: Wed, 15 Jan 2014 23:18:39 +0000 (-0800) Subject: pull: add --ff-only to the help text X-Git-Tag: v2.0.0-rc0~165^2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ef93e3a49c3b2b62c6c450f862ce1626bc8dab54?ds=sidebyside pull: add --ff-only to the help text Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano --- diff --git a/git-pull.sh b/git-pull.sh index 44b792a5d2..d17a461b3d 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -4,7 +4,7 @@ # # Fetch one or more remote refs and merge it/them into the current HEAD. -USAGE='[-n | --no-stat] [--[no-]commit] [--[no-]squash] [--[no-]ff] [--[no-]rebase|--rebase=preserve] [-s strategy]... [] ...' +USAGE='[-n | --no-stat] [--[no-]commit] [--[no-]squash] [--[no-]ff|--ff-only] [--[no-]rebase|--rebase=preserve] [-s strategy]... [] ...' LONG_USAGE='Fetch one or more remote refs and integrate it/them with the current HEAD.' SUBDIRECTORY_OK=Yes OPTIONS_SPEC=