summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d41df15)
raw | patch | inline | side by side (parent: d41df15)
author | Martin Langhoff <martin@catalyst.net.nz> | |
Mon, 30 Jan 2006 06:34:15 +0000 (19:34 +1300) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Mon, 30 Jan 2006 07:25:42 +0000 (23:25 -0800) |
Updated with Randall Schwartz's suggestion.
Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/git-cvsexportcommit.txt | patch | blob | history |
index 13cbf3ba67c06716f1ab882be24d50880fadddfc..d30435a9e4c6ec9797110869c202aea2f8e257a1 100644 (file)
to merge patches from a git repository into a CVS repository.
Execute it from the root of the CVS working copy. GIT_DIR must be defined.
+See examples below.
It does its best to do the safe thing, it will check that the files are
unchanged and up to date in the CVS checkout, and it will not autocommit
-v::
Verbose.
+EXAMPLES
+--------
+
+Merge one patch into CVS::
++
+------------
+$ export GIT_DIR=~/project/.git
+$ cd ~/project_cvs_checkout
+$ git-cvsexportcommit -v <commit-sha1>
+$ cvs commit -F .mgs <files>
+------------
+
+Merge pending patches into CVS automatically -- only if you really know what you are doing ::
++
+------------
+$ export GIT_DIR=~/project/.git
+$ cd ~/project_cvs_checkout
+$ git-cherry cvshead myhead | sed -n 's/^+ //p' | xargs -l1 git-cvsexportcommit -c -p -v
+------------
+
Author
------
Written by Martin Langhoff <martin@catalyst.net.nz>