ensure default pull fast-forward behavior #70
Merged
Conversation
This file contains 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
ensure default pull fast-forward behavior is used to avoid errors when git is configured to use another behavior through the pull.ff option.
Codecov Report
@@ Coverage Diff @@
## master #70 +/- ##
=======================================
Coverage 82.80% 82.80%
=======================================
Files 6 6
Lines 407 407
=======================================
Hits 337 337
Misses 70 70
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
carmenbianca
approved these changes
Jul 14, 2023
|
@yajo @pedrobaeza, @simahawk I think you are key users of the git-aggregate tool. Do you've a comment about the proposed change? |
|
OK for me. |
pedrobaeza
approved these changes
Jul 17, 2023
simahawk
approved these changes
Jul 17, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
ensure default pull fast-forward behavior is used to avoid errors when git is configured to use another behavior through the
pull.ffoption.replaces #65.