git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Samuel Bronson <naesten@gmail.com>
To: git@vger.kernel.org
Cc: Samuel Bronson <naesten@gmail.com>
Subject: [PATCH/RFC 1/2] pull: pass the --no-ff-only flag through to merge, not fetch
Date: Wed, 30 Nov 2011 20:38:56 -0500	[thread overview]
Message-ID: <1322703537-3914-1-git-send-email-naesten@gmail.com> (raw)

Without this, pull becomes unusable for merging branches when the config
option `merge.ff` is set to `only`.

Signed-off-by: Samuel Bronson <naesten@gmail.com>
---
 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

             reply	other threads:[~2011-12-01  1:40 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-12-01  1:38 Samuel Bronson [this message]
2011-12-01  1:38 ` [PATCH/RFC 2/2] merge, pull: Document the --no-ff-only merge option Samuel Bronson
2011-12-01  4:58 ` [PATCH/RFC 1/2] pull: pass the --no-ff-only flag through to merge, not fetch Junio C Hamano
2011-12-01 17:18   ` Samuel Bronson
2011-12-01 18:06     ` Junio C Hamano
2011-12-01 18:59       ` Samuel Bronson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1322703537-3914-1-git-send-email-naesten@gmail.com \
    --to=naesten@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).