From: Junio C Hamano <gitster@pobox.com>
To: Felipe Contreras <felipe.contreras@gmail.com>
Cc: git@vger.kernel.org, Andreas Krey <a.krey@gmx.de>,
John Keeping <john@keeping.me.uk>, Jeff King <peff@peff.net>,
Richard Hansen <rhansen@bbn.com>,
Philip Oakley <philipoakley@iee.org>,
sandals@crustytoothpaste.net
Subject: Re: [PATCH v3 1/5] pull: rename pull.rename to pull.mode
Date: Tue, 10 Sep 2013 14:34:24 -0700 [thread overview]
Message-ID: <xmqqppsgwecf.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1378689796-19305-2-git-send-email-felipe.contreras@gmail.com> (Felipe Contreras's message of "Sun, 8 Sep 2013 20:23:12 -0500")
Felipe Contreras <felipe.contreras@gmail.com> writes:
> Also 'branch.<name>.rebase' to 'branch.<name>.pullmode'.
>
> This way 'pull.mode' can be set to 'merge', and the default can be
> something else.
>
> The old configurations still work, but get deprecated.
Sounds good, but we should still mention these old names in the
documentation (and mark them as deprecated).
> +test "$mode" == 'rebase' && rebase="true"
POSIX test does not take "==" as string equality; it is a bash-ism.
test "$mode" = rebase
next prev parent reply other threads:[~2013-09-10 21:34 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-09 1:23 [PATCH v3 0/5] Preparation for non-ff pulls by default Felipe Contreras
2013-09-09 1:23 ` [PATCH v3 1/5] pull: rename pull.rename to pull.mode Felipe Contreras
2013-09-09 21:23 ` Richard Hansen
2013-09-09 22:49 ` Felipe Contreras
2013-09-10 2:21 ` Jeff King
2013-09-10 6:46 ` Felipe Contreras
2013-09-10 6:52 ` Jeff King
2013-09-10 8:16 ` Matthieu Moy
2013-10-11 23:56 ` Felipe Contreras
2013-10-12 0:32 ` Richard Hansen
2013-10-12 0:50 ` Jeff King
2013-10-12 1:15 ` Felipe Contreras
2013-10-12 1:25 ` Jeff King
2013-10-12 2:08 ` Felipe Contreras
2013-10-12 4:40 ` Richard Hansen
2013-10-12 6:21 ` Felipe Contreras
2013-09-19 19:33 ` Richard Hansen
2013-10-11 23:54 ` Felipe Contreras
2013-09-10 21:34 ` Junio C Hamano [this message]
2013-09-09 1:23 ` [PATCH v3 2/5] pull: refactor $rebase variable into $mode Felipe Contreras
2013-09-09 1:23 ` [PATCH v3 3/5] pull: add --merge option Felipe Contreras
2013-09-09 1:23 ` [PATCH v3 4/5] pull: add merge-ff-only option Felipe Contreras
2013-09-09 1:23 ` [PATCH v3 5/5] pull: add warning on non-ff merges Felipe Contreras
2013-09-09 1:49 ` Felipe Contreras
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=xmqqppsgwecf.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=a.krey@gmx.de \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=john@keeping.me.uk \
--cc=peff@peff.net \
--cc=philipoakley@iee.org \
--cc=rhansen@bbn.com \
--cc=sandals@crustytoothpaste.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.