Reset git diff settings for color and mnemonicprefix to default#1
Merged
gsamokovarov merged 1 commit intoall_the_featuresfrom Nov 7, 2018
Merged
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This is m4i#32 rebased for the NickLaMuro/all_the_features branch. I'd prefer if we eventually merge the whole all_the_features branch into master and go from there, should we need to apply other patches to our own fork.
I have run into this problem while trying to commit only Gemfile and Gemfile.lock changes. Follow the issue and the test to gain more context.
Pinging @skanev.