search

littlebee / git-time-machine

Atom package that allows you to travel back in commit history
MIT License
1.12k stars 36 forks source link

Don't clobber certain user-defined split-diff configs #97

Closed dwtj closed 7 years ago

dwtj commented 7 years ago

With various Atom syntax themes, I have a hard time reading split-diff when "Show Word Diff" is enabled (especially when the underlying code uses various colors because of syntax highlighting). Thus, I usually want this setting to be disabled. I can do so in the split-diff configuration menu or by setting the split-diff config boolean diffWords to false.

However, even if I disable this behavior, one use of git-time-machine always brings it back.

After a minute of grepping, it looks git-time-machine might modify this setting here.

I understand why you might need to override the default rightEditorColor and leftEditorColor, and for UX reasons, I even understand overriding scrollSyncType. But is it really necessary to override diffWords and for that matter ignoreWhitespace?

I would prefer that git-time-machine not modify the user's global diffWords and ignoreWhitespace settings.

dwtj commented 7 years ago

(FYI. It appears that just removing these two lines gives me the behavior that I'm looking for.)

waldnzwrld commented 7 years ago

Sorry for the stacked pr etc..... I was doing this through the UI :)

littlebee commented 7 years ago

fixed in 1.5.7