pull.twohead and pull.octopus supports multiple default strategies but this was undocumented and it was not obvious how to do so. Signed-off-by: Miklos Vajna <vmiklos@xxxxxxxxxxxxxx> --- Documentation/config.txt | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 217980f..8a4abb2 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -924,10 +924,12 @@ pack.packSizeLimit:: pull.octopus:: The default merge strategy to use when pulling multiple branches - at once. + at once. Multiple strategies can be defined using a space + separated list. pull.twohead:: The default merge strategy to use when pulling a single branch. + Multiple strategies can be defined using a space separated list. remote.<name>.url:: The URL of a remote repository. See linkgit:git-fetch[1] or -- 1.5.5 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
