From: Junio C Hamano <gitster@pobox.com>
To: Matthias Baumgarten <matthias.baumgarten@aixigo.com>
Cc: Felipe Contreras <felipe.contreras@gmail.com>,
Elijah Newren <newren@gmail.com>,
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>
Subject: Re: When are you going to stop ignoring pull.mode?
Date: Mon, 19 Jul 2021 09:54:53 -0700 [thread overview]
Message-ID: <xmqq4kcqnt0i.fsf@gitster.g> (raw)
In-Reply-To: <948ef19f-5588-62e9-6fc7-aa6d82f21a1b@aixigo.com> (Matthias Baumgarten's message of "Mon, 19 Jul 2021 16:14:14 +0200")
Matthias Baumgarten <matthias.baumgarten@aixigo.com> writes:
> Initially I came from the situation where I (as maintainer of a
> repository) proposed to do a `git pull --ff-only <remote-git-url>
> <branch-name>` for the others to integrate the newest changes safely
> (i.e. failing if they had errouneously worked on that branch, which it
> is not intended for). I thought I could reach that safety with the
> `--ff-only` part, but it seems one of the devs had pull.rebase set for
> him locally and thus managed to bypass my "safety". Mr. Elijah Newren
> called this a bug, see [1].
Yes, I saw it and I agree with Elijah.
Thanks.
next prev parent reply other threads:[~2021-07-19 17:00 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
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 [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq4kcqnt0i.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=alexhenrie24@gmail.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.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.
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.