anatoly techtonik wrote:
> On Tue, Aug 24, 2010 at 2:29 PM, Stefan Sperling <stsp_at_elego.de> wrote:
> >> >
> >> > --internal-diff seems to be new in 1.7 so i guess the only option is using
> >> > --config-dir to override it.
> >> Why not to stop proliferation of options by allowing an empty value
> >> for --diff-cmd to be treated as an instructions to use internal
> >> implementation?
> > Boils down to personal preference.
> > See http://svn.haxx.se/dev/archive-2010-05/0456.shtml
> I believe Git has --no-ext-diff option for that purpose, but I still
Let's rename "--internal-diff" to "--no-ext-diff", just for ease of
memory for those who use both Svn and Git.
> think that universal ability to reset option to default with
> `--diff-cmd=""` or `--config-option config:helpers:diff-cmd=""` is a
> better approach, because it will also allow to use default values for
> other cmd options like editor-cmd, diff3-cmd, merge-tool-cmd and ssh.
You know what? I like that reasoning.
We could still have a "--internal-diff" (or "--no-ext-diff") for
user-friendliness reasons, but define it as an alias for
"--diff-cmd=''". That would have the advantage of making clear how
those two options would interact if both are specified.
Received on 2010-08-24 14:49:23 CEST