Andreas Schwab writes:
> Merges are recognized purely by matching the commit message, and the
> regexp must capture the branch name in the first subexpr. The -m option
> enables some default regexps but won't match your example. You can use
> -M 'Merge branch ([-\w]+)' to match it.
Thanks, I t
On Jun 25 2017, Urs Thuermann wrote:
> In both cases, the branch "a-branch" is in the git repository but is
> not merged with the master branch, i.e. rev 1.4 has only parent 1.3
> but not 1.2.2.2. I also tried cvsimport with several regexes passed
> using -M to match "Merge branch a-branch", but
I want to convert several old CVS repositories to Git. Some of these
CVS repositories contain branches, which have later been merged to the
main trunk. When I try to convert using cvs2git or git cvsimport the
branches appear in the new git repository but they are not merged to
the master branch.
3 matches
Mail list logo
