From 2cac017e2e856fab2c2d23de5e3f999d0d1de617 Mon Sep 17 00:00:00 2001 From: Simon Mezzomo Date: Thu, 4 Feb 2021 18:01:28 +0100 Subject: [PATCH] Add warning about "subrepo" branch conflict Please add a warning to the documentation to inform the user about the current gitrepo limitation when a branch named "subrepo" until it can be fixed. Related to issue https://github.com/ingydotnet/git-subrepo/issues/299 I don't know how to properly update the rest of the documentation, so I may need some help for that. --- doc/git-subrepo.swim | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/git-subrepo.swim b/doc/git-subrepo.swim index 96dc0141..ccab6d1a 100644 --- a/doc/git-subrepo.swim +++ b/doc/git-subrepo.swim @@ -76,7 +76,9 @@ The best short answer is: The complete "Installation Instructions" can be found below. -Note: git-subrepo needs a git version (> 2.7) that supports worktree:s. +Notes: +* git-subrepo needs a git version (> 2.7) that supports worktree:s. +* some commands may break if the repository contains a branch named "subrepo". = Commands