All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] completion: add missing configuration variables
Date: Wed, 15 Dec 2010 23:23:04 -0500	[thread overview]
Message-ID: <20101216042304.GA886@sigill.intra.peff.net> (raw)
In-Reply-To: <alpine.DEB.1.10.1012151931030.25560@debian>

On Wed, Dec 15, 2010 at 08:44:45PM +0100, Martin von Zweigbergk wrote:

> > One note:
> > 
> > >  		color.diff
> > >  		color.diff.commit
> > >  		color.diff.frag
> > > +		color.diff.func
> > >  		color.diff.meta
> > >  		color.diff.new
> > >  		color.diff.old
> > >  		color.diff.plain
> > >  		color.diff.whitespace
> > 
> > We have color.diff.branch coming soon (I think it is in 'next' now).
> 
> Strictly speaking, that note is for Junio to think of when he merges,
> right? But adding it early is pretty harmless and if that relieves him
> of some work, I would be happy to add it in the next submission of
> this patch. Is that better?
> 
> Thinking a bit more, maybe what you are suggesting is that I base the
> next revision of this patch on the branch that adds that variable?

The "correct" thing to do from a topic branch standpoint is to submit
this patch without it as its own topic, submit a patch with just
color.diff.branch on top of the other topic, and then the merge
resolution will include both sets.

In this case, it might be OK to just start shipping color.diff.branch in
the completion list. It doesn't hurt anything to have the extra
completion before the feature is in, and the feature seems very likely
to make it in soon.

But I'll let Junio decide how meticulous about history he wants to be.
:)

-Peff

  reply	other threads:[~2010-12-16  4:23 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-12-15  6:46 [PATCH] completion: add missing configuration variables Martin von Zweigbergk
2010-12-15 13:00 ` Jeff King
2010-12-15 19:44   ` Martin von Zweigbergk
2010-12-16  4:23     ` Jeff King [this message]
2010-12-17 20:52       ` Junio C Hamano
2010-12-17 21:04         ` Jeff King
2010-12-16 12:42     ` SZEDER Gábor
2010-12-16  7:14       ` Martin von Zweigbergk
2010-12-16 14:28         ` Jeff King
2010-12-17 20:44   ` Junio C Hamano
2010-12-17 21:21     ` Jeff King
2010-12-20 15:18 ` [PATCH v2] " Martin von Zweigbergk
2010-12-20 21:20   ` Jeff King
2010-12-21  1:22     ` Junio C Hamano

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=20101216042304.GA886@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=martin.von.zweigbergk@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.