On Mon, Oct 27, 2014 at 6:32 PM, Junio C Hamano gits...@pobox.com wrote:
Jeff King p...@peff.net writes:
If that is the only casualty, I think it is probably a net-win. We may
want better tooling around viewing the merge later, but that can wait
until somebody steps up with a real use case
On Mon, Oct 27, 2014 at 01:59:18PM -0700, Junio C Hamano wrote:
I do not think it is too hard to teach strbuf_commented_addf() about
the leading HT, but that would be a separate topic; if squashing the
SP-HT to HT is worth doing for this codepath, doing it at that helper
would benefit all
On Mon, Oct 27, 2014 at 02:14:42PM -0700, Jonathan Nieder wrote:
Jeff King wrote:
For the most part, combined-diff (and --cc) will show the interesting
cases anyway. But if you take a whole file from one side of the merge,
then there is nothing interesting for diff to show. Do people
Jeff King p...@peff.net writes:
Just to play devil's advocate for a moment, though, are we hurting
people who find it useful to record that information in the commit
message?
I thought about it, but ultimately, they are using it wrong if they
did depend on them. As you said, the paths
Junio C Hamano gits...@pobox.com writes:
diff --git a/sequencer.c b/sequencer.c
index 0f84bbe..1d97da3 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -291,13 +291,12 @@ void append_conflicts_hint(struct strbuf *msgbuf)
{
int i;
- strbuf_addstr(msgbuf, \nConflicts:\n);
+
Jeff King wrote:
For the most part, combined-diff (and --cc) will show the interesting
cases anyway. But if you take a whole file from one side of the merge,
then there is nothing interesting for diff to show. Do people still want
to get that more complete list of potentially interesting
On Fri, Oct 24, 2014 at 02:24:37PM -0700, Junio C Hamano wrote:
Just like other hints such as Change to be committed we show in
the editor to remind the committer what paths were involved in the
resulting commit to improve their log message, this section is
merely a reminder. Traditionally,
Just like other hints such as Change to be committed we show in
the editor to remind the committer what paths were involved in the
resulting commit to improve their log message, this section is
merely a reminder. Traditionally, it was not made into comments
primarily because it has to be
8 matches
Mail list logo
