From: Bagas Sanjaya <bagasdotme@gmail.com>
To: Felipe Contreras <felipe.contreras@gmail.com>,
Elijah Newren <newren@gmail.com>,
Junio C Hamano <gitster@pobox.com>
Cc: Elijah Newren via GitGitGadget <gitgitgadget@gmail.com>,
Git Mailing List <git@vger.kernel.org>,
Alex Henrie <alexhenrie24@gmail.com>,
Phillip Wood <phillip.wood123@gmail.com>,
Son Luong Ngoc <sluongng@gmail.com>,
Matthias Baumgarten <matthias.baumgarten@aixigo.com>
Subject: Re: When are you going to stop ignoring pull.mode?
Date: Sat, 17 Jul 2021 09:14:12 +0700 [thread overview]
Message-ID: <c015e599-0178-cc3d-11be-175dc917f2b9@gmail.com> (raw)
In-Reply-To: <60f1daa896f69_330208b1@natae.notmuch>
On 17/07/21 02.14, Felipe Contreras wrote:
> The solution is simple and self-documenting:
>
> pull.mode={fast-forward,merge,rebase}
>
But how about config transition from pull.{ff,rebase} to pull.mode?
--
An old man doll... just what I always wanted! - Clara
next prev parent reply other threads:[~2021-07-17 2:14 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-16 19:14 When are you going to stop ignoring pull.mode? Felipe Contreras
2021-07-17 2:14 ` Bagas Sanjaya [this message]
2021-07-17 17:53 ` Felipe Contreras
2021-07-17 10:22 ` Matthias Baumgarten
2021-07-17 17:57 ` Felipe Contreras
2021-07-17 21:22 ` Junio C Hamano
2021-07-17 21:59 ` Felipe Contreras
2021-07-19 14:14 ` Matthias Baumgarten
2021-07-19 16:54 ` Junio C Hamano
2021-07-19 17:15 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c015e599-0178-cc3d-11be-175dc917f2b9@gmail.com \
--to=bagasdotme@gmail.com \
--cc=alexhenrie24@gmail.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=matthias.baumgarten@aixigo.com \
--cc=newren@gmail.com \
--cc=phillip.wood123@gmail.com \
--cc=sluongng@gmail.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).