From: Junio C Hamano <gitster@pobox.com>
To: Jakub Narebski <jnareb@gmail.com>
Cc: git@vger.kernel.org, Jay Soffian <jaysoffian@gmail.com>,
Ramkumar Ramachandra <artagnon@gmail.com>
Subject: Re: [PATCH v2] Teach merge the '[-e|--edit]' option
Date: Mon, 10 Oct 2011 08:23:18 -0700 [thread overview]
Message-ID: <7vmxd8oopl.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <m3ehyl1g5v.fsf@localhost.localdomain> (Jakub Narebski's message of "Mon, 10 Oct 2011 00:05:02 -0700 (PDT)")
Jakub Narebski <jnareb@gmail.com> writes:
> Yet another issue is if we should blindly trust automatic merge resolution.
> It is considered a good practice by some to always check (e.g. by compiling
> and possibly also running tests) the result of merge, whether it required
> merge conflict resolution or not.
>
> IIRC Linus lately said that making "git merge" automatically commit
> was one of bad design decisions of git, for the above reason...
I think your recalling this discussion
http://thread.gmane.org/gmane.linux.kernel/1191100/focus=181362
While I agree with what Linus said in the message, I think you are not
remembering the discussion correctly. It was about bad commit _message_,
and an improvement is not to let users tweak a cleanly automerged result,
but is to allow users or force them to always write their own message,
perhaps with "merge --[no-]edit", which is exactly the point of Jay's
patch in this thread.
prev parent reply other threads:[~2011-10-10 15:23 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-07 15:29 [PATCH] Teach merge the '[-e|--edit]' option Jay Soffian
2011-10-07 17:30 ` Junio C Hamano
2011-10-07 18:01 ` Jay Soffian
2011-10-07 19:01 ` Junio C Hamano
2011-10-07 19:22 ` Jay Soffian
2011-10-07 19:07 ` Jay Soffian
2011-10-07 19:40 ` Junio C Hamano
2011-10-07 21:46 ` [PATCH v2] " Jay Soffian
2011-10-07 22:15 ` Junio C Hamano
2011-10-08 18:11 ` Jay Soffian
2011-10-09 23:23 ` Junio C Hamano
2011-10-10 5:29 ` Junio C Hamano
2011-10-10 7:05 ` Jakub Narebski
2011-10-10 7:50 ` Matthieu Moy
2011-10-10 15:23 ` Junio C Hamano [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=7vmxd8oopl.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=artagnon@gmail.com \
--cc=git@vger.kernel.org \
--cc=jaysoffian@gmail.com \
--cc=jnareb@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.