mirror of
https://github.com/kahole/edamagit.git
synced 2024-09-11 07:15:31 +03:00
Merge pull request #293 from garymm/develop
Set --no-ext-diff when running git diff
This commit is contained in:
commit
d02ed6fd95
@ -82,7 +82,7 @@ async function diffWorktree({ repository }: MenuState) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function diff(repository: MagitRepository, id: string, args: string[] = []) {
|
async function diff(repository: MagitRepository, id: string, args: string[] = []) {
|
||||||
const diffResult = await gitRun(repository.gitRepository, ['diff', ...args]);
|
const diffResult = await gitRun(repository.gitRepository, ['diff', '--no-ext-diff', ...args]);
|
||||||
|
|
||||||
const uri = DiffView.encodeLocation(repository, id);
|
const uri = DiffView.encodeLocation(repository, id);
|
||||||
return ViewUtils.showView(uri, new DiffView(uri, diffResult.stdout));
|
return ViewUtils.showView(uri, new DiffView(uri, diffResult.stdout));
|
||||||
|
Loading…
Reference in New Issue
Block a user