git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v2] t7610 (mergetool): more nitpicks

From
Charles Bailey <charles@hashpling.org>
Date
Aug 25, 2010, 07:56 UTC
Message-ID
<20100825075650.GB18308@hashpling.org>
In-Reply-To
<20100825074034.GA4058@gmail.com>
On Wed, Aug 25, 2010 at 12:40:38AM -0700, David Aguilar wrote:
Show 11 quoted lines
> On Tue, Aug 24, 2010 at 07:25:52PM -0500, Jonathan Nieder wrote:
> >  - use tabs to indent
> > [...]
> 
> Cool.  I'd like to do the same to git-mergetool.sh too.
> Until now I've stuck to the existing style.
> My editor is setup to display tabs visually which makes it easy
> for me to emulate existing code but not everyone does that.
> 
> Any objections to a patch that replaces the mixed 4-space+tab
> indents with pure tabs?
Just the same objection as the last time:
http://thread.gmane.org/gmane.comp.version-control.git/115069/focus=115192

We've already tidyied up mergetool to be consistent, I don't see what touching 90% of the lines achieves other than getting yourself 'blamed' for everything in mergetool.

Charles.
Previous: David AguilarNext: David Aguilar
Message 7 of 8 in “t7610: cd inside subshell instead of around”
  1. t7610: cd inside subshell instead of aroundBrian Gernhardt, Aug 24, 2010
  2. Jonathan NiederAug 24, 2010
  3. Brian GernhardtAug 24, 2010
  4. Jonathan NiederAug 24, 2010
  5. t7610 (mergetool): more nitpicksJonathan Nieder, Aug 25, 2010
  6. David AguilarAug 25, 2010
  7. Charles BaileyAug 25, 2010
  8. David AguilarAug 26, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.