Changes between Version 25 and Version 26 of UsingGit

Timestamp:

04/10/12 11:41:43 (14 years ago)

Author:

sphery

Comment:

Update stable version for 0.25; Remove reference to creating a github account for developers with push privileges

UsingGit

@@ -1 +1 @@
 == Using git with MythTV ==
 
-You will need to create a github account, and link your @mythtv.org email address to it (if a MythTV developer).  If you aren't a part of the development team, you can still create a github account and fork the repository into your account, giving pull requests later to get your changes incorporated.
+To work with MythTV source code, you may either create a read-only repository (allowing you to build MythTV and make local changes, only):
 
-For development with a github account, clone the repository with:
+{{{
+git clone git://github.com/MythTV/mythtv.git
+}}}
+
+Or you may create a github account and fork the repository into your account, allowing you to push your changes to your fork (for others to see/use) and to provide pull requests in tickets to get your changes incorporated:
 
 {{{
@@ -9 +13 @@
 }}}
 
-
-For read-only access, use:
-
-{{{
-git clone git://github.com/MythTV/mythtv.git
-}}}
-
 To switch to another branch:
 
 {{{
-git checkout fixes/0.24
+git checkout fixes/0.25
 }}}
 
@@ -70 +67 @@
 || svn diff || git diff || show differences since last stage commit ||
 || svn stat || git status || ||
-|| svn commit || git commit / git push || in git, git commit commits locally, git push pushes to the upstream repo.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   Additionally, changes must be staged before committing. ||
+|| svn commit || git commit / git push || in git, git commit commits locally, git push pushes to the upstream repo. Additionally, changes must be staged before committing. ||
 || ---- || git add -i / git add -p || stage commits ||
 || svn update || git pull || technically, this is two steps combined (git fetch, git merge) git pull --rebase does a rebase instead of a merge ||
@@ -82 +79 @@
 || svn revert -R (for pristine index and working copy) || git reset --hard || applies to entire tree so no filename or directory allowed ||
 
-To cherry pick a commit from master to fixes/0.24 (this automatically commits to your local branch):
+To cherry pick a commit from master to fixes/0.25 (this automatically commits to your local branch):
 {{{
-git checkout fixes/0.24; git cherry-pick {commitref} (retrieve commitref hash from git log, e-mail or github history)
+git checkout fixes/0.25; git cherry-pick {commitref} (retrieve commitref hash from git log, e-mail or github history)
 }}}
 To see log for specific branch