summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-04-27 14:04:27 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-04-27 14:04:27 +0000
commit1721148bae4f1a9721a0b988befb5b7d8c9e22f5 (patch)
tree49a8e00da400306d4e0242530e8485d9294c3cd5 /doc
parentba807648ea64bf536424c4652af8337192207d77 (diff)
downloadredmine-1721148bae4f1a9721a0b988befb5b7d8c9e22f5.tar.gz
redmine-1721148bae4f1a9721a0b988befb5b7d8c9e22f5.zip
Remove obsolete github descriptions from doc/git.rdoc.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5555 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'doc')
-rw-r--r--doc/git.rdoc12
1 files changed, 4 insertions, 8 deletions
diff --git a/doc/git.rdoc b/doc/git.rdoc
index 739e7df43..aa1b624af 100644
--- a/doc/git.rdoc
+++ b/doc/git.rdoc
@@ -1,17 +1,13 @@
= Contributing to Redmine with git and github
-(This is a beta document. If you can improve it, fork it and send a patch/pull request.)
+(This is a beta document.)
-The official repository is at http://github.com/edavis10/redmine
+The mirror repository is at http://github.com/edavis10/redmine
-Official branches:
+Branches:
-* master - is automatically mirrored to svn trunk. DO NOT COMMIT OR MERGE INTO THIS BRANCH
+* master - is automatically mirrored to svn trunk.
* [0.6, 0.7, 0.8, 0.9, 1.0,...]-stable - is automatically mirrored to svn release branches. DO NOT COMMIT OR MERGE INTO THIS BRANCH
-* integration-to-svn-trunk - this branch is a git-only branch that will track master (trunk). Any code in here will be eventually merged into master but it may be rebased as any time (git-svn needs to rebase to commit to svn)
-* integration-to-svn-stable-1.0 - this branch is a git-only branch that will track the 1.0-stable branch in svn. Any code in here will be eventually merged into master and 1.0-stable but it may be rebased as any time (git-svn needs to rebase to commit to svn)
-
-I (edavis10) might have some other branches on the repository for work in progress.
== Branch naming standards