todgru

#git Branch

Bits about gits

(freakin awesome http://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging)

Also, see JadedEvan's gist about branching. In particular, 'Create a new branch and have it track remote commits'

To create a new branch and switch to that branch:

$ git checkout -b my_new_branch

todgru

<?php
/*
  By Marco Arment <me@marco.org>.
  This code is released in the public domain.

  THERE IS ABSOLUTELY NO WARRANTY.

  Usage example:

  // In a registration or password-change form:

todgru

Order of execution in OSX:

/etc/profile
~/.bash_profile
~/.bashrc
~/.bash_login
~/.profile
~/.bash_logout

todgru

#Submodules

Here is how we do it at Our Office

---

When you clone your working repos (api, app, www), you'll have an empty Modules directory. The working repo will contain a pointer to the hash of the last Modules repo committed. All that needs to be done from your working repo directory is:

$ git subumodule init

todgru

Here are a few bits of info regarding .DS_Store files on Mac OSX. What they are: http://en.wikipedia.org/wiki/.DS_Store

The .DS_Store file is used to store metadata for icon information and are only created when using the gui to browse the file system.

Ways of removing them: http://helpx.adobe.com/dreamweaver/kb/remove-ds-store-files-mac.html

One time removal:

todgru

See http://stackoverflow.com/questions/7773181/git-keeps-prompting-me-for-password

Make sure you are cloning your repos using ssh:

ssh://git@github.com/username/repo.git

If you use https or git, you will always be asked for username/password:

https://github.com/username/repo.git

git://github.com/username/repo.git

todgru

#The Big Headache.

A common error we get when attempting to run rake -T after a git pull is:

rake aborted!
cannot load such file -- some/gem_file
/Users/todgru/.rvm/gems/ruby-1.9.3-p194/gems/vlad-2.3.0/lib/vlad.rb:3:in `require'
/Users/todgru/.rvm/gems/ruby-1.9.3-p194/gems/vlad-2.3.0/lib/vlad.rb:3:in `<top (required)>'
/Users/todgru/.rvm/gems/ruby-1.9.3-p194/gems/bundler-1.2.2/lib/bundler/runtime.rb:68:in `require'

/Users/todgru/.rvm/gems/ruby-1.9.3-p194/gems/bundler-1.2.2/lib/bundler/runtime.rb:68:in `block (2 levels) in require'

todgru

#Oops, I merged untested changes to master!

You've made changes to master, commited and push up to your repo. Git is flexible enough that you can dig yourself out rather easily. Here are two of many options to get back to a safe place.

• Option 1, Branch out and keep your changes.
• Option 2, Reset the branch and lose changes.

The final step in both of these options is $ git push --force origin master.

##Option 1: Branch Out

todgru

#How to use Pull Request

From https://help.github.com/articles/using-pull-requests

After you have branched from the mainline, made changes, commit to your branch and push your branch to the Github repo.

In the Github repo, select your branch from the drop down.

Click pull request......

todgru

#git tag

Think of a git tag as an alias to a sha1 or to a branch.

The Git Book on tagging says there are two main typs of tags, lightweight and annotated. Lightweight only records commit and tag. Annotated records who, what, when and where. Use annotated, -a.

List all tags:

$ git tag