{"id":413,"date":"2011-10-10T23:25:24","date_gmt":"2011-10-10T23:25:24","guid":{"rendered":"http:\/\/41j.com\/blog\/?p=413"},"modified":"2011-10-13T09:42:46","modified_gmt":"2011-10-13T09:42:46","slug":"simple-git-example-local-repository","status":"publish","type":"post","link":"https:\/\/41j.com\/blog\/2011\/10\/simple-git-example-local-repository\/","title":{"rendered":"Simple git example (local repository)"},"content":{"rendered":"

0. Configure your information:<\/p>\n

\r\ngit config --global user.name "Mr User the user"\r\ngit config --global user.email "mruser@theinternets.com"\r\n<\/pre>\n
You can also configure an editor:<\/p>\n
\r\ngit config --global core.editor 'vim'\r\n<\/pre>\n
1. Create a repository<\/p>\n
\r\nmkdir testproject\r\ncd testproject\r\ngit init\r\n<\/pre>\n
2. Commit a file<\/p>\n
\r\ntouch testfile\r\ngit add testfile\r\ngit commit\r\n<\/pre>\n
3. Making a release branch<\/p>\n
\r\ngit branch RB_1.0 master\r\n<\/pre>\n
While you’ve created a release branch, you’re still currently on the master branch. So if you make a change here:<\/p>\n
\r\ntouch testfile2\r\ngit add testfile2\r\ngit commit\r\n<\/pre>\n
That file will NOT be in the release branch (RB_1.0).<\/p>\n
4. Switching between the master branch and the release branch.<\/p>\n
Unlike, SVN which stores different branches in different directories, git uses a command to switch your directory between branches. Slightly confusingly this command is called “checkout”.<\/p>\n
\r\ngit checkout RB_1.0\r\n<\/pre>\n
If you want, you can make changes to RB_1.0, they wont be refected elsewhere.<\/p>\n
\r\ntouch rb1file\r\ngit add rb1file\r\ngit commit\r\n<\/pre>\n
5. Releasing<\/p>\n
Create a tag:<\/p>\n
\r\ngit tag 1.0 RB_1.0\r\n<\/pre>\n
List all tags:<\/p>\n
\r\ngit tag\r\n<\/pre>\n
6. Merging<\/p>\n
Merge changes from RB_1.0 on to master:<\/p>\n
\r\ngit checkout master\r\ngit rebase RB_1.0\r\n<\/pre>\n
7. Delete a branch<\/p>\n
It seems to be git practice to delete branches, you can always branch from the tag.<\/p>\n
\r\ngit branch -d RB_1.0\r\n<\/pre>\n
8. Creating a tarball<\/p>\n
\r\ngit archive --format=tar --prefix=testproject1 1.0 > ~\/testproject1.tar\r\n<\/pre>\n
9. Changing a file!<\/p>\n
This may be slightly different than you were expecting. You can’t just edit the file and type “git commit” rather, you need to add then commit. For example, after editing testfile:<\/p>\n
\r\ngit add testfile\r\ngit commit\r\n<\/pre>\n
Git creates commits in two stages like this. The first add “stages” the change and commit commits it. You can do multiple adds before the commit. The idea is to let you get everything organised before finally performing the commit.<\/p>\n
Notes on git<\/h2>\n
There are no version numbers. A revision is identified by its hash.<\/p>\n
master is like trunk in SVN\/CVS.<\/p>\n
checkout, doesn’t really mean checkout. It mean switch between branches.<\/p>\n
You can also branch from tags the same way you branch from master.<\/p>\n","protected":false},"excerpt":{"rendered":"
0. Configure your information: git config –global user.name "Mr User the user" git config –global user.email "mruser@theinternets.com" You can also configure an editor: git config –global core.editor ‘vim’ 1. Create a repository mkdir testproject cd testproject git init 2. Commit a file touch testfile git add testfile git commit 3. Making a release branch git […]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"jetpack_post_was_ever_published":false,"_jetpack_newsletter_access":"","_jetpack_dont_email_post_to_subs":false,"_jetpack_newsletter_tier_id":0,"_jetpack_memberships_contains_paywalled_content":false,"_jetpack_memberships_contains_paid_content":false,"footnotes":"","jetpack_publicize_message":"","jetpack_publicize_feature_enabled":true,"jetpack_social_post_already_shared":false,"jetpack_social_options":{"image_generator_settings":{"template":"highway","default_image_id":0,"font":"","enabled":false},"version":2}},"categories":[1],"tags":[6,8,7],"class_list":["post-413","post","type-post","status-publish","format-standard","hentry","category-uncategorized","tag-git","tag-revision-control","tag-svn"],"jetpack_publicize_connections":[],"jetpack_featured_media_url":"","jetpack_shortlink":"https:\/\/wp.me\/p1RRoU-6F","jetpack_sharing_enabled":true,"_links":{"self":[{"href":"https:\/\/41j.com\/blog\/wp-json\/wp\/v2\/posts\/413","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/41j.com\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/41j.com\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/41j.com\/blog\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/41j.com\/blog\/wp-json\/wp\/v2\/comments?post=413"}],"version-history":[{"count":3,"href":"https:\/\/41j.com\/blog\/wp-json\/wp\/v2\/posts\/413\/revisions"}],"predecessor-version":[{"id":450,"href":"https:\/\/41j.com\/blog\/wp-json\/wp\/v2\/posts\/413\/revisions\/450"}],"wp:attachment":[{"href":"https:\/\/41j.com\/blog\/wp-json\/wp\/v2\/media?parent=413"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/41j.com\/blog\/wp-json\/wp\/v2\/categories?post=413"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/41j.com\/blog\/wp-json\/wp\/v2\/tags?post=413"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}