Andrew's git / gitweb.git / diff
?
pull: add --ff-only to the help text
authorDavid Aguilar <davvid@gmail.com>
Wed, 15 Jan 2014 23:18:39 +0000 (15:18 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 16 Jan 2014 00:01:07 +0000 (16:01 -0800)
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-pull.sh patch | blob | history
diff --git a/git-pull.sh b/git-pull.sh
index 44b792a5d2007d89d1735d1d114e439c3d365d99..d17a461b3d8fd4c35b795ca1855c24e39d2cc908 100755 (executable)
--- 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.
 
 #
 # 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=
 LONG_USAGE='Fetch one or more remote refs and integrate it/them with the current HEAD.'
 SUBDIRECTORY_OK=Yes
 OPTIONS_SPEC=