From: Stephen Haberman <stephen@exigencecorp.com>
To: Andres Perera <andres.p@zoho.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] pull: Allow pull to preserve merges when rebasing.
Date: Sun, 11 Aug 2013 18:38:45 -0500 [thread overview]
Message-ID: <20130811183845.18381b8c@sh9> (raw)
In-Reply-To: <CAPrKj1aMURcVoaiJ+WS64ekafUZgSagKrYSknTUk3+TL6tCETQ@mail.gmail.com>
Hi Andres,
> i just realized that there are ambiguities:
> pull --rebase (true|false|preserve) foo # pull from remote named
> (true|false|preserve), branch foo
Yeah.
Right now, I did the latter. Around line 125, when parsing "--rebase
<somearg>", we accept <somearg> only if it's true, false, or preserve,
and shift it off. Otherwise we leave it alone and assume it's a remote
name.
Without this logic, t5520 fails because it uses "git pull --rebase .
copy", which, as you noted, is ambiguous, so "." was showing up as the
rebase argument.
So, this is technically handled right now, but I'm fine removing the
ambiguous "--rebase true|false|preserve" option if that is what is
preferred.
- Stephen
next prev parent reply other threads:[~2013-08-11 23:39 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-11 21:26 [PATCH] pull: Allow pull to preserve merges when rebasing Stephen Haberman
2013-08-11 23:03 ` Andres Perera
2013-08-11 23:09 ` Stephen Haberman
2013-08-11 23:31 ` Andres Perera
2013-08-11 23:38 ` Stephen Haberman [this message]
2013-08-12 5:40 ` Junio C Hamano
2013-08-12 7:00 ` Junio C Hamano
2013-08-12 17:04 ` Stephen Haberman
-- strict thread matches above, loose matches on Subject: below --
2013-08-13 3:43 Stephen Haberman
2013-08-12 6:21 Stephen Haberman
2013-08-12 6:46 ` Junio C Hamano
2013-08-12 16:28 ` Stephen Haberman
2013-08-10 4:58 Stephen Haberman
2013-08-11 6:16 ` Eric Sunshine
2013-08-11 7:12 ` Eric Sunshine
2013-08-08 17:38 [RFC] allow git pull to preserve merges Stephen Haberman
2013-08-08 17:38 ` [PATCH] pull: Allow pull to preserve merges when rebasing Stephen Haberman
2013-08-08 19:08 ` Stephen Haberman
2013-08-08 21:20 ` Johannes Schindelin
2013-08-08 21:35 ` Stephen Haberman
2013-08-08 21:56 ` Philip Oakley
2013-08-08 21:57 ` Junio C Hamano
2013-08-09 14:19 ` Johannes Schindelin
2013-08-09 15:28 ` Stephen Haberman
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=20130811183845.18381b8c@sh9 \
--to=stephen@exigencecorp.com \
--cc=andres.p@zoho.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).