Git Reference¶

Get the latest code, will download all branches, with the development version active by default (similar to svn checkout):

git clone git://git.shishnet.org/shimmie2.git

Create a local copy of upstream's stable branch:

git checkout -b my_branch_2.3 origin/branch_2.3

Pull updates from upstream and merge them with the current files (similar to svn update):

git pull

Keep track of a third party branch:

git remote add artanis git://github.com/Artanis/shimmie.git
git fetch artanis

this will create a set of artanis/* branches, which work the same way as the origin/* branches

Committing Changes¶

Commit changes in a set of files to your local branch (similar to svn commit):

git commit -m "Descriptive Message" ext/foo/*.php foo/bar/somethingelse.txt

If you want to commit all changes in all files, you can use "-a" instead of a list of files

Sending Changes Upstream¶

Show the difference between the currenly active code and the upstream 2.3 code (similar to svn diff)

git diff origin/branch_2.3

Redirect to a diff file and email~ I'm certain that there's a better way ("git send-email"?), but I can't get it to work <_< Alternatively if you have a publicly visible copy of your git repository, I can pull changes straight from that

Public Repositories¶

(Feel free to add any others :3)

git://git.shishnet.org/shimmie2.git   -- Shish's official repository
git://github.com/Artanis/shimmie.git  -- Artanis's customisations
git://github.com/dgz/nc-shimmie.git   -- JJS's nanochan version
git://github.com/Shish/shimmie2.git   -- Shish's backup (mostly used to take
                                         advantage of github's pretty graphs)