I have recently taken the plunge into learning Git. These are my notes thus far. I know there are plenty of git write-ups out there on the web. I started this one mostly for myself as a quick cheat sheet. I figure it may be useful to someone so I am sharing it.
My typical git workflow
– git init (or clone)
– work on files on main branch
– git branch [newbranchname] (create a new branch for a new feature)
– git checkout branch (switch to that new branch)
– git merge [newbranchname] (merge new feature into main branch)
– git add . (or git add path/to/file(s))
– git commit (leave good notes)
– git pull [remote] [branch] (to sync with other devs)
– git push [remote] [branch] (send my local commits to other devs or repo server)
Some descriptions of other git commands
git init (initializes a directory as a new Git repository)
git clone [url] (copies an existing Git repository)
git remote (list local "remote" aliases)
git remote add/rm [url] (creates a new alias)
git add (add changes; those could be in files or directory structure)
git add -u (adds unstaged changes including deletes not done with git rm)
git add -p (add changes per chunk in a file!)
gif diff (--cached for staged changes)
git commit (records a snapshot of the staging area)
git commit -m (specify a commit message on the command line)
git commit -a (skip the add step and do it automatically -a will not add new files)
git rm (delete a file, can be used to actually delete the file or after the fact to inform git of the action)
git rm --cached (aka un-add/un-track)
git reset (unstage changes that you have staged, opposite of git add)
git checkout -- ..." to discard changes in working directory (???)
git update-index --assume-unchanged (ignore uncommitted changes in a file that is already tracked)
git pull/push (eg git push memoryties master)
My main source of information so far has been Git Reference.
– git reset: http://progit.org/2011/07/11/reset.html
Last month, Google released rich text signatures for their Gmail product.
When I read this I was excited that I may be able to get rid of the plug-in I had been using for this same purpose. While the plugin worked, most of the time, there were times when it did not. I also personally prefer to use built-in features whenever possible.
I checked out the new Rich Text Signature setting. Quickly I found that it allowed you to add images and links, yet still lacked the ability to do HTML editing. Not yet ready to give up I Googled to see if anyone else had found a way to do HTML in the new Rich Text Signature setting. Finding none I set to figuring out my own solution.
As I thought I remembered that this same feature could be found in Google Sites (and perhaps elsewhere). So I logged into one of my Google Sites and sure enough, the editor was almost identical, except that in the Google Sites editor there is an “HTML” button, which is lacking on the Gmail editor.
I had the idea that perhaps I could use the Google Sites editor to get an HTML signature into Gmail. It worked. Here is how I did it.
I created a new page on my Google Site. I clicked on the “HTML” button to “Edit HTML Source”. I pasted in the HTML I had been using with the plugin. I clicked “Update”. Now my signature showed up in the new Google Site page as rich text. I then highlighted the rich text version, copied it, went to my Gmail settings and pasted it into the Rich Text Signature editor. I saved and the click on Compose. Lo, and behold, there it was. Like magic.
I hope this helps you out until Gmail adds that HTML button to the Gmail editor.
My friend Brian just release this sweet iPhone App that puts my LDS Ward Directory on my iPhone. If you are an LDS member and want quick and easy access to your Ward Directory, you need to check out
iWard by Avikey.
Thank you Jeffrey! For introducing me to Simplify Media. With this handy little app, I can have the functionality that Apple took out so long ago. What functionality? Sharing my iTunes library with people outside my local network. 30 people to be exact, with Simplify Media. 30 people all over the world can all see and share my iTunes library. All of it. Anywhere they have a connection, so long as my iTunes library is open and connected to the Internet.
Not only that, but I can do the same thing with my iPhone. So let’s say I was in a rush and forgot to sync that new playlist I made on my computer to my iPhone. No problem, open Simplify Media and I am now listening to it.
Go to their web site and click on the Pledge Now! button. They do not list the date that Firefox 3 will be released but when you pledge and give them your email address they promised to send you an email with a reminder when they are about to release it.
Set a Guinness World Record Enjoy a Better Web
Sounds like a good deal, right? All you have to do is get Firefox 3 during Download Day to help set the record for most software downloads in 24 hours – it’s that easy. We’re not asking you to swallow a sword or to balance 30 spoons on your face, although that would be kind of awesome.
By the way, the official date for the launch of Firefox 3 will be posted here soon – so check back! Join our community and this effort by pledging today.
UPDATE: “The official date for the launch of Firefox 3 is June 17, 2008. Join our community and this effort by pledging today.”