Added option for opt-out of TFS merge replicating #929
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
|
Cool, this looks good, and it's pretty simple. Could you add the new stuff to the docs, at least for init and clone and config?
I don't like that. Maybe |
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.
Sometimes TFS guys do merge changesets apparently at random, while in git merge-commit has meaning that all commits in the parent branches are merged. Thus preserving all of the merges sometimes do more harm than good. New setting is tfs.replicateTfsMerges and could be "0" or "1". This setting is turned on by default (i.e. if there's no such value in the git config file - it treats as "1") and is global (not tied to particular tfs remote/branch - mostly because on the per-tfs-remote basis it can do much confusion if configured differently in different places.
Also
initcommand now has-m+or--replicateTfsMerges+option, that is true by default, but can be opted out like-m-or--replicateTfsMerges-(not sure it is the best syntax, but by the NDesk.Options docs it is the one used for bools).