From 6c70667475ab792c39a6e550661ff12b8d146e94 Mon Sep 17 00:00:00 2001 From: justin Date: Mon, 1 Apr 2013 19:18:01 -0700 Subject: [PATCH] Add etc/makefile.usr to list of files to commit; separate master and release commits --- docs/developer/Release/index.mdwn | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/docs/developer/Release/index.mdwn b/docs/developer/Release/index.mdwn index 73eec722..6d8a2297 100644 --- a/docs/developer/Release/index.mdwn +++ b/docs/developer/Release/index.mdwn @@ -67,10 +67,19 @@ In the "Default .Os value" section, bump up the version to that of the master (o Make sure all changes on the master branch **and** on the new branch have been committed and pushed before tagging anything. - git add sys/sys/param.h sys/conf/newvers.sh gnu/usr.bin/groff/tmac/mdoc.local +On release: + + git add sys/sys/param.h sys/conf/newvers.sh gnu/usr.bin/groff/tmac/mdoc.local etc/Makefile.usr git commit git push +On master: + + git add sys/sys/param.h sys/conf/newvers.sh gnu/usr.bin/groff/tmac/mdoc.local + git commit + git push + + man git-tag for info, the committer needs GPG set up so git tag -s works. Then you can use your own checkout. Be sure the checkouts are under your user id and you do the tagging as yourself instead of as root. ###In master -- 2.41.0