![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Martin Langhoff <martin@ng.eduforge.org> | |
| Tue, 16 Aug 2005 10:35:27 +0000 (22:35 +1200) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 17 Aug 2005 21:53:39 +0000 (14:53 -0700) | ||
| commit | db4b65821e65138177de9afbce70f141cc831224 | |
| tree | 01248c4c6921a83479bfa3b7bf11c272e036b9d1 | tree | snapshot |
| parent | da139813a7242f96e6926fd15881b9df94625132 | commit | diff |
[PATCH] Add merge detection to git-cvsimport
Added -m and -M flags for git-cvsimport to detect merge commits in cvs.
While this trusts the commit message, in repositories where merge commits
indicate 'merged from FOOBRANCH' the import works surprisingly well.
Even if some merges from CVS are bogus or incomplete, the resulting
branches are in better state to go forward (and merge) than without any
merge detection.
Signed-off-by: Martin Langhoff <martin.langhoff@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Added -m and -M flags for git-cvsimport to detect merge commits in cvs.
While this trusts the commit message, in repositories where merge commits
indicate 'merged from FOOBRANCH' the import works surprisingly well.
Even if some merges from CVS are bogus or incomplete, the resulting
branches are in better state to go forward (and merge) than without any
merge detection.
Signed-off-by: Martin Langhoff <martin.langhoff@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| Documentation/git-cvsimport-script.txt | diff | blob | history | |
| git-cvsimport-script | diff | blob | history |