All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ted Pavlic <ted@tedpavlic.com>
To: Keith Cascio <keith@CS.UCLA.EDU>
Cc: git <git@vger.kernel.org>, Junio C Hamano <gitster@pobox.com>,
	Johannes Schindelin <Johannes.Schindelin@gmx.de>,
	Nanako Shiraishi <nanako3@lavabit.com>
Subject: Re: diff settings
Date: Sat, 31 Jan 2009 14:47:25 -0500	[thread overview]
Message-ID: <4984AACD.20600@tedpavlic.com> (raw)
In-Reply-To: <alpine.GSO.2.00.0901310750470.5437@kiwi.cs.ucla.edu>

> Thank you for alerting us to the Hg design.  I can appreciate the elegance of
> it, and I'm always in favor of the most general possible implementation.  But
> there is a subtle difference between diff.primer and primer.diff.

As I already discussed, Mercurial has both "diff.primer" and 
"primer.diff" precisely because "diff" settings affects so many Hg commands.

In particular, in my .hgrc, I have:

[diff]
git = 1

which causes all Mercurial commands that need to generate a diff to use 
gitdiff rather than truediff. However, if I *wanted* to apply a set of 
flags to a particular command, I could (using the equivalent "git" 
commands)...

[defaults]
pull = --rebase
commit = -a
format-patch = -M

So I see a purpose for both *.defaults and defaults.*. Of course, 
aliases are also nice (IIRC, Mercurial doesn't have "aliases", but I 
could be wrong). Mercurial users are very happy with having both 
available. I imagine git people would be too.

--Ted


-- 
Ted Pavlic <ted@tedpavlic.com>

   Please visit my ALS association page:
         http://web.alsa.org/goto/tedpavlic
   My family appreciates your support in the fight to defeat ALS.

  parent reply	other threads:[~2009-01-31 20:05 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-01-24 17:38 diff settings Keith Cascio
2009-01-24 19:22 ` Jeff King
2009-01-24 19:33 ` Teemu Likonen
2009-01-24 20:01   ` Keith Cascio
2009-01-25 21:02     ` Ted Pavlic
2009-01-25 21:11       ` Keith Cascio
2009-01-26  2:06         ` Ted Pavlic
2009-01-29 16:26           ` Ted Pavlic
2009-01-29 16:33             ` Johannes Schindelin
2009-01-29 18:46               ` Keith Cascio
2009-01-29 21:07                 ` Nanako Shiraishi
     [not found]           ` <alpine.GSO.2.00.0901310750470.5437@kiwi.cs.ucla.edu>
2009-01-31 19:47             ` Ted Pavlic [this message]
2009-01-31 23:10               ` Keith Cascio

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=4984AACD.20600@tedpavlic.com \
    --to=ted@tedpavlic.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=keith@CS.UCLA.EDU \
    --cc=nanako3@lavabit.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.