diff options
| author |  David Aguilar <davvid@gmail.com> | 2010-03-27 14:58:09 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-03-28 09:29:12 -0700 |
| commit | 42accaec0174f80c81681c4a6f896ca452ba3f76 (patch) | |
| tree | 5809f9e914e118676549432c4071a344520e8400 /contrib/examples/git-reset.sh | |
| parent | fast-export: don't segfault when marks file cannot be opened (diff) | |
| download | tgif-42accaec0174f80c81681c4a6f896ca452ba3f76.tar.xz | |
difftool: Fix '--gui' when diff.guitool is unconfigured
When diff.guitool is unconfigured and "--gui" is specified
git-difftool dies with the following error message:
config diff.guitool: command returned error: 1
Catch the error so that the "--gui" flag is a no-op when
diff.guitool is unconfigured.
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/examples/git-reset.sh')
0 files changed, 0 insertions, 0 deletions