From: Andrew Ardill <andrew.ardill@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: 乙酸鋰 <ch3cooli@gmail.com>, git@vger.kernel.org
Subject: Re: Merge option suggestion (dictator, humble)
Date: Wed, 17 Oct 2012 10:17:34 +1100 [thread overview]
Message-ID: <CAH5451me=JC5kL-_LZNaSrEX3b1MR6W6sa=A8CUtsxH480wm3g@mail.gmail.com> (raw)
In-Reply-To: <7vpq4is553.fsf@alter.siamese.dyndns.org>
On 17 October 2012 04:23, Junio C Hamano <gitster@pobox.com> wrote:
> 乙酸鋰 <ch3cooli@gmail.com> writes:
>
>> I would like to suggest 2 merge options
>> --dictator use all my changes
>> --humble use all their changes
>>
>> These allows to produce a fast-forward commit, without resolving any conflicts.
>> Sometimes, someone did something completely wrong, so the commit needs
>> to be ignored.
>
>> I cannot tell everyone in the world to run git fetch followed by git
>> reset --hard.
>
> Then you cannot tell them to use "pull --humble" either, can you?
>
> Not seeing any merit in the proposal (yet).
Would this allow setting up a project-default merge configuration for
contributors that defaulted to --humble? Not sure if that is useful or
not, but it at least seems safer than trying to default to doing reset
--hard after every merge.
Regards,
Andrew Ardill
prev parent reply other threads:[~2012-10-16 23:18 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-16 15:52 Merge option suggestion (dictator, humble) 乙酸鋰
2012-10-16 17:23 ` Junio C Hamano
2012-10-16 23:17 ` Andrew Ardill [this message]
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='CAH5451me=JC5kL-_LZNaSrEX3b1MR6W6sa=A8CUtsxH480wm3g@mail.gmail.com' \
--to=andrew.ardill@gmail.com \
--cc=ch3cooli@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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 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).