pull: add --ff-only to the help text

davvid · gitster · commit ef93e3a49c3b · 2014-01-15T16:01:07.000-08:00
Signed-off-by: David Aguilar &lt;davvid@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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]... [<fetch-options>] <repo> <head>...'
+USAGE='[-n | --no-stat] [--[no-]commit] [--[no-]squash] [--[no-]ff|--ff-only] [--[no-]rebase|--rebase=preserve] [-s strategy]... [<fetch-options>] <repo> <head>...'
 LONG_USAGE='Fetch one or more remote refs and integrate it/them with the current HEAD.'
 SUBDIRECTORY_OK=Yes
 OPTIONS_SPEC=

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#`
`5`	`5`	`# Fetch one or more remote refs and merge it/them into the current HEAD.`
`6`	`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`	`8`	`LONG_USAGE='Fetch one or more remote refs and integrate it/them with the current HEAD.'`
`9`	`9`	`SUBDIRECTORY_OK=Yes`
`10`	`10`	`OPTIONS_SPEC=`