Set git diff to a default value

Question

I previously changed my git diff tool with git config --global diff.external <diff-tool-name>. I decided I don't like that tool and wanted to switch back.

I tried meddling around and did something like: git config --global diff.external git-diff. Now calling git diff to see unstaged changes yields:

fatal: ambiguous argument '48e66b706d21398f28240810e7fc0d44d8f92d99': unknown revision or path not in the working tr
Use '--' to separate paths from revisions
external diff died, stopping at somefile.ext.

How do I set my git diff command to use the default command line git diff that came with git. Something like:

git config --global diff.

and then what?

Can you explain further? `git diff` is the default command line git diff, if you want gui, its `git difftool`. — Šimon Tóth, Feb 10 '11 at 10:18
@Let_Me_Be thanks! I didn't know this. Finally I can see diffs with `vimdiff` without the need of external scripts or configuration changes :) — Jacobo de Vera, Feb 10 '11 at 14:08
Your global config file is a simple `ini` file which you can edit by hand. — Noufal Ibrahim, Apr 18 '14 at 16:04
[this](http://stackoverflow.com/a/3713865/2624806) also worked fine. — CoDe, Sep 24 '15 at 12:47

score 62 · Accepted Answer · answered Feb 10 '11 at 10:27

62

Try
git config --global --unset diff

and

git config --global --unset diff.external

See the explanation of git config for further details.

answered Feb 10 '11 at 10:27

eckes

64,417
29
168
201

8

this say error: key does not contain a section: diff. any suggestion! – CoDe Sep 23 '15 at 05:47
Works like a charm! Thanks mate! – vnay92 Apr 14 '16 at 10:54
1

Well, that's not a solution. What if you configured your global environment and you want to do a local override using GIT_EXTERNAL_DIFF? – Massimiliano Arione Nov 07 '16 at 17:36
6

I get an error `error: key does not contain a section: diff` when I run the first command. – Matt Jun 26 '17 at 16:04

Set git diff to a default value

1 Answers1

Linked