This repository was archived by the owner on Nov 30, 2021. It is now read-only.
Use --no-ext-diff to prevent output being munged by user's diff drivers#22
Open
jamezpolley wants to merge 1 commit intomotemen:masterfrom
Open
Use --no-ext-diff to prevent output being munged by user's diff drivers#22jamezpolley wants to merge 1 commit intomotemen:masterfrom
jamezpolley wants to merge 1 commit intomotemen:masterfrom
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I use a wrapper for 'git diff' so that my diffs open up in vimdiff. When vimdiff's output is not a terminal it gets confused... and the resulting output showing up in the scratch space is not useful.
I've tweaked the places I spotted that call 'git diff' to use the '--no-ext-diff' flag, which prevents using the external driver and gives nice clean output.