summaryrefslogtreecommitdiff
path: root/git-pull.sh
diff options
context:
space:
mode:
authorDavid Aguilar <davvid@gmail.com>2014-01-15 15:18:39 -0800
committerJunio C Hamano <gitster@pobox.com>2014-01-15 16:01:07 -0800
commitef93e3a49c3b2b62c6c450f862ce1626bc8dab54 (patch)
tree848f2f09d74e7b749d1b7f2bedd9ddf99f71c27e /git-pull.sh
parentb814da891e8261b909fc5d9fb07b4e8b13989c2d (diff)
downloadgit-ef93e3a49c3b2b62c6c450f862ce1626bc8dab54.tar.gz
pull: add --ff-only to the help textda/pull-ff-configuration
Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-pull.sh')
-rwxr-xr-xgit-pull.sh2
1 files changed, 1 insertions, 1 deletions
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]... [<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=