From: Samuel Bronson Date: Thu, 01 Dec 2011 01:38:56 GMT Subject: [PATCH/RFC 1/2] pull: pass the --no-ff-only flag through to merge, not fetch Message-ID: <1322703537-3914-1-git-send-email-naesten@gmail.com> Without this, pull becomes unusable for merging branches when the config option `merge.ff` is set to `only`. Signed-off-by: Samuel Bronson --- git-pull.sh | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/git-pull.sh b/git-pull.sh index 9868a0b..a09fcbc 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -76,6 +76,8 @@ do no_ff=--no-ff ;; --ff-only) ff_only=--ff-only ;; + --no-ff-only) + ff_only=--no-ff-only ;; -s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\ --strateg=*|--strategy=*|\ -s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy) -- 1.7.7.3