From 6c31129ee7feb7caae40406ccaadfba0fe41c63b Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Sun, 22 Feb 2009 09:46:13 +0100 Subject: [PATCH] committer(7): Add some lines about MFCing. --- share/man/man7/committer.7 | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) 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 ... +git push crater rel2_2:DragonFly_RELEASE_2_2 +.Ed .Pp Do not set the default remote tag to .Pa origin . -- 1.7.7.2