Changes between Initial Version and Version 1 of UsingGit


Ignore:
Timestamp:
11/09/10 05:18:00 (15 years ago)
Author:
beirdo
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • UsingGit

    v1 v1  
     1== Using git with MythTV ==
     2
     3Once this is put onto MythTV servers, these details will change.
     4
     5For now, we will use the svn->git mirror:
     6
     7{{{
     8git clone http://git.jannau.net/git/mythtv.complete/
     9}}}
     10
     11For committing, use SVN (which you will have to checkout separately)
     12
     13=== configuring git ===
     14
     15{{{
     16git config --global user.name "Your Name"
     17git config --global user.email you@yourdomain.example.com
     18}}}
     19
     20Please use your real name and a real email address.  This will be attached to each commit you make, and is needed for legality reasons (i.e. to clearly denote the contributors, which can be a life-saver if we have licensing issues later)
     21
     22=== git for svn users ===
     23
     24https://git.wiki.kernel.org/index.php/GitSvnCrashCourse
     25
     26https://git.wiki.kernel.org/images-git/7/78/Git-svn-cheatsheet.pdf
     27
     28||= svn command =||= git command =||= comments =||
     29|| svn checkout || git clone || ||
     30|| svn diff || git diff || pretty much identical ||
     31|| svn stat || git status || ||
     32|| 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. ||
     33|| ---- || git add -i / git add -p || stage commits ||
     34|| svn update || git pull || technically, this is two steps combined (git fetch, git merge) ||
     35|| svn copy (to create a branch) || git branch (or git checkout -b) || ||
     36|| svn copy (to create a tag) || git tag || ||
     37|| svn switch || git checkout branch ||  ||
     38|| svn merge || git merge || ||