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>
David Aguilar committed
Jan 15, 2014 at 15:18 UTC
ef93e3a49c3b2b62c6c450f862ce1626bc8dab54
1 file changed
+1
-1
git-pull.sh
+1
-1
@@ -4,7 +4,7 @@
4
#
5
# Fetch one or more remote refs and merge it/them into the current HEAD.
6
7
-USAGE='[-n | --no-stat] [--[no-]commit] [--[no-]squash] [--[no-]ff] [--[no-]rebase|--rebase=preserve] [-s strategy]... [<fetch-options>] <repo> <head>...'
7
+USAGE='[-n | --no-stat] [--[no-]commit] [--[no-]squash] [--[no-]ff|--ff-only] [--[no-]rebase|--rebase=preserve] [-s strategy]... [<fetch-options>] <repo> <head>...'
8
LONG_USAGE='Fetch one or more remote refs and integrate it/them with the current HEAD.'
9
SUBDIRECTORY_OK=Yes
10
OPTIONS_SPEC=