From: Sascha Wildner <saw@online.de>
Date: Sun, 22 Feb 2009 08:46:13 +0000 (+0100)
Subject: committer(7): Add some lines about MFCing.
X-Git-Tag: v2.3.1~352^2~31
X-Git-Url: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/6c31129ee7feb7caae40406ccaadfba0fe41c63b

committer(7): Add some lines about MFCing.
---

diff --git a/share/man/man7/committer.7 b/share/man/man7/committer.7
index 6fee8ea..fad3e3a 100644
--- a/share/man/man7/committer.7
+++ b/share/man/man7/committer.7
@@ -32,7 +32,7 @@
 .\" 
 .\" $DragonFly: src/share/man/man7/committer.7,v 1.11 2008/05/02 02:05:06 swildner Exp $
 .\" 
-.Dd December 3, 2008
+.Dd February 22, 2009
 .Dt COMMITTER 7
 .Os
 .Sh NAME
@@ -151,9 +151,13 @@ use:
 git push crater
 .Ed
 .Pp
-See
-.Xr development 7
-how to commit to a specific branch (to merge bug fixes, for example).
+To merge bug fixes to other branches (MFC), use
+.Nm git Cm cherry-pick :
+.Bd -literal -offset indent
+git checkout -b rel2_2 crater/DragonFly_RELEASE_2_2
+git cherry-pick <commit>...
+git push crater rel2_2:DragonFly_RELEASE_2_2
+.Ed
 .Pp
 Do not set the default remote tag to
 .Pa origin .