From: David Aguilar Date: Wed, 15 Jan 2014 23:18:39 GMT Subject: [PATCH 2/2] pull: add --ff-only to the help text Message-ID: <1389827919-13608-2-git-send-email-davvid@gmail.com> In-Reply-To: <1389827919-13608-1-git-send-email-davvid@gmail.com> Signed-off-by: David Aguilar --- git-pull.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-pull.sh b/git-pull.sh index 7dbf6b1..68b2e40 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= -- 1.8.5.3.322.g71d2a99