Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GitLens should use diff.guitool if available #195

Closed
pluma opened this issue Nov 9, 2017 · 2 comments
Closed

GitLens should use diff.guitool if available #195

pluma opened this issue Nov 9, 2017 · 2 comments
Assignees
@eamodio
Labels
feature New feature or request

Comments

@pluma
Copy link

pluma commented Nov 9, 2017

  • GitLens Version: 5.7.1
  • VSCode Version: 1.17.2
  • OS Version: N/A

(Continued from #57)

Currently gitlens tries to use diff.tool for directory diffs and complains if it is not available.

Setting diff.tool to a GUI tool makes the git CLI awkward to use. However git allows explicitly using a GUI tool by invoking git diff --gui which looks for a git config called diff.guitool.

GitLens should try to use diff.guitool if it has been set and fall back to diff.tool otherwise. This means that if GitLens invokes git diff it should also pass the --gui flag as appropriate. GitLens should still warn about the git config if neither diff.guitool nor diff.tool have been set.
@eamodio eamodio self-assigned this Nov 9, 2017
@eamodio eamodio added the feature New feature or request label Nov 9, 2017
@eamodio eamodio added this to the Soon™ milestone Nov 9, 2017
@pluma
Copy link
Author

pluma commented Nov 14, 2017

Ooh, nice. Thank you!

@eamodio eamodio removed this from the Soon™ milestone Jul 19, 2019
@snyk-bot snyk-bot mentioned this issue Mar 10, 2020
Open
@normanzb normanzb mentioned this issue Nov 11, 2020
Closed
@github-actions
Copy link

This issue has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Nov 30, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees

@eamodio eamodio

Labels
feature New feature or request
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@eamodio @pluma