| brians | aede41c | 2013-02-18 04:41:19 +0000 | [diff] [blame] | 1 | Some us are using git for managing quickly changing code. This file has |
| jerrym | cea3b8d | 2013-03-11 07:57:37 +0000 | [diff] [blame] | 2 | notes for setting that up. |
| 3 | |
| 4 | ssh to robotics.mvla.net and add the git executables to your .bashrc: |
| 5 | PATH=$PATH:/www/https/files/frc971/2013/brian/ |
| brians | aede41c | 2013-02-18 04:41:19 +0000 | [diff] [blame] | 6 | |
| 7 | [Cloning] |
| 8 | `git clone \ |
| jerrym | cea3b8d | 2013-03-11 07:57:37 +0000 | [diff] [blame] | 9 | ssh://USERNAME@robotics.mvla.net/www/https/git/frc971/SOMEBODY/2013.git` |
| 10 | where USERNAME is your login on the server and SOMEBODY is whoever's git |
| brians | aede41c | 2013-02-18 04:41:19 +0000 | [diff] [blame] | 11 | repo you want to clone |
| Brian Silverman | c2a5ae3 | 2013-02-21 20:35:32 -0800 | [diff] [blame^] | 12 | If you don't gave a login on the server, then cloning |
| 13 | https://robotics.mvla.net/git/frc971/somebody/2013.git instead should work |
| 14 | (with your SVN username and password). However, that form of URL is read- |
| 15 | only. |
| brians | aede41c | 2013-02-18 04:41:19 +0000 | [diff] [blame] | 16 | |
| 17 | [Adding Other People's Repositories] |
| jerrym | cea3b8d | 2013-03-11 07:57:37 +0000 | [diff] [blame] | 18 | `git remote add SOMEBODY \ |
| 19 | ssh://USERNAME@robotics.mvla.net/www.https/git/frc971/SOMEBODY/2013.git` |
| 20 | where USERNAME is your login on the server and SOMEBODY is another person's |
| brians | aede41c | 2013-02-18 04:41:19 +0000 | [diff] [blame] | 21 | git repository |
| Brian Silverman | c2a5ae3 | 2013-02-21 20:35:32 -0800 | [diff] [blame^] | 22 | The https:// URL should work too. |
| brians | aede41c | 2013-02-18 04:41:19 +0000 | [diff] [blame] | 23 | |
| brians | ae54f07 | 2013-02-18 05:24:06 +0000 | [diff] [blame] | 24 | [Working with Other People's Repositories] |
| jerrym | cea3b8d | 2013-03-11 07:57:37 +0000 | [diff] [blame] | 25 | `git fetch SOMEBODY` will pull their changes, and then you can rebase on top of |
| brians | ae54f07 | 2013-02-18 05:24:06 +0000 | [diff] [blame] | 26 | them etc. |
| 27 | `git push --mirror` will push all of your local branches so that everybody else |
| jerrym | cea3b8d | 2013-03-11 07:57:37 +0000 | [diff] [blame] | 28 | can see them. (This is the default if the configuration option remote.<remote>.mirror is set.) |
| Brian Silverman | c2a5ae3 | 2013-02-21 20:35:32 -0800 | [diff] [blame^] | 29 | However, you can not do that with an https:// URL. |
| brians | 66d5730 | 2013-02-18 05:10:42 +0000 | [diff] [blame] | 30 | |
| brians | aede41c | 2013-02-18 04:41:19 +0000 | [diff] [blame] | 31 | [Synchronizing with SVN] |
| jerrym | cea3b8d | 2013-03-11 07:57:37 +0000 | [diff] [blame] | 32 | In order to synchronize the git commits with svn, somebody has to set up git-svn in their local git repo and then push/pull commits. |
| 33 | |
| 34 | To do that, `git svn init https://robotics.mvla.net/svn/frc971/2013/trunk/src` |
| 35 | |
| 36 | Then, unless you want git-svn to pull down everything from SVN again, you have to edit .git/refs/remotes/git-svn (or whatever you name the remote) and put in the commit ID of the latest commit in the repository that's from SVN. |
| 37 | |
| 38 | After doing that (and a `git svn fetch`), git-svn works like usual. |
| 39 | |
| 40 | To pull changes from svn, do `git-svn fetch`. To push changes to svn, do `git svn dcommit`, which will take all of your git commits between the latest commit from svn and your HEAD and make them into svn commits. |
| 41 | |
| 42 | Multiple people dealing with svn works OK because the git commit SHAs end up the same so they all just become the same. |
| Brian Silverman | c2a5ae3 | 2013-02-21 20:35:32 -0800 | [diff] [blame^] | 43 | |
| 44 | [Repository Setup] |
| 45 | In order for https:// access to work, you have to make sure to rename |
| 46 | .git/hooks/post-update.sample to .git/hooks/post-update (and then run |
| 47 | `git update-server-info` if you're not going to push immediately). |