This shows you the differences between two versions of the page.
Next revision | Previous revisionLast revisionBoth sides next revision | ||
tutorials:scmgit-intro [2011/04/30 14:46] – created clemens | tutorials:scmgit-intro [2012/04/30 19:11] – minor formatting memnon | ||
---|---|---|---|
Line 11: | Line 11: | ||
===== Configuring your account to use git on sdf ===== | ===== Configuring your account to use git on sdf ===== | ||
- | First, you must be MetaARPA to use git.\\ | + | First, you must be MetaARPA to use git. |
+ | Second, the git pkg installs most binaries you need in / | ||
+ | |||
+ | | ||
+ | |||
+ | Now any SSH session will have the necessary git binaries in the PATH. | ||
===== Creating a central git repository on SDF ===== | ===== Creating a central git repository on SDF ===== | ||
Line 19: | Line 24: | ||
==== Create the server repository ==== | ==== Create the server repository ==== | ||
- | cd ~\\ mkdir git\\ mkdir myproject\\ git --bare init\\ \\ And that's it! on the server side. This remains empty until you first " | + | |
+ | mkdir git | ||
+ | mkdir myproject | ||
+ | git --bare init | ||
+ | |||
+ | And that's it! on the server side. This remains empty until you first " | ||
===== Creating your local git repository. ===== | ===== Creating your local git repository. ===== | ||
- | Let's assume you already have a project you want to start watching under git, with the files \\ | + | Let's assume you already have a project you want to start watching under git, with the files |
+ | | ||
+ | | ||
+ | | ||
+ | | ||
+ | |||
+ | First, initialize the git project: | ||
+ | |||
+ | cd ~/proj | ||
+ | git init | ||
+ | |||
+ | Now your repository is initialized! Time to check in your current project. First we add the files to the repository. I like to manually add each file instead of doing a " | ||
+ | |||
+ | git add test.c include/ | ||
+ | git commit | ||
+ | |||
+ | If the commit failed, follow the directions onscreen to configure your username and email so git can track you as a user in the repository. | ||
+ | Now time to connect your local copy to the repository on sdf. | ||
+ | |||
+ | git remote add origin user@sdf.lonestar.org: | ||
+ | git push origin master | ||
+ | |||
+ | Git should ask for your password, and then tell you it uploaded the objects and that everything succeeded. | ||
+ | If not, ask on the sdf forum for advise. | ||
===== Copying your central repository to a client machine ===== | ===== Copying your central repository to a client machine ===== | ||
- | Last thing: Now that you have a central copy, how do you check it out? use "git clone": | + | Last thing: Now that you have a central copy, how do you check it out? use "git clone": |
+ | git clone ssh:// | ||
===== Backing up all your existing git repos to a remote server ===== | ===== Backing up all your existing git repos to a remote server ===== | ||
- | sdf doesn' | + | sdf doesn' |
* check your git repo for any changes | * check your git repo for any changes | ||
Line 84: | Line 118: | ||
git remote add origin user@sdf.lonestar.org: | git remote add origin user@sdf.lonestar.org: | ||
- | where " | + | where " |
+ | Then, you do | ||
git fetch | git fetch | ||
Line 90: | Line 125: | ||
followed by | followed by | ||
- | " | + | |
Git also provides the command "git pull" to do a fetch followed by a merge. This is unlike CVS and Subversion, where " | Git also provides the command "git pull" to do a fetch followed by a merge. This is unlike CVS and Subversion, where " | ||
+ | |||
+ | ===== Further Reading ===== | ||
+ | |||
+ | There are quite a few good tutorials freely available on the net. Check out: | ||
+ | * [[http:// | ||
+ | * [[http:// | ||
+ | * [[http:// | ||
+ | * [[http:// | ||
===== TODO ===== | ===== TODO ===== | ||
- | merging/ | + | * merging/ |
+ | |||
+ | Best look online for more in-depth tutorials.. | ||
+ | I haven' |