Tool Time

MetaTools
Ken Collins - metaskills.net

Thursday, December 9, 2010

git


No GUI!
$ Command Line == Productive


alias gco='git checkout'
$ gco -b some_feature


alias gb='git branch'
alias gba='git branch -a'


alias gst='git status'


alias ga='git add -i'


alias ga='git add -i'

interactive mode


alias gc='git commit -v'


alias gc='git commit -v'

verbose with unified diff


alias gca='git commit -v -a'


Workflow
Example
(single file)


# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# modified: README.textile
#
# Changed but not updated:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
# modified: _layouts/default.html
# modified: _layouts/post.html
# modified: z_metadata/app/models/article.rb
#
diff --git a/README.textile b/README.textile
index 9fa1b2c..e368e6d 100644
--- a/README.textile
+++ b/README.textile
@@ -3,10 +3,12 @@ h1. Todo

* Design
- Fixed Left Nav / Fat Bottom Area
-* Consider using feedburner vs my own alternate atom?
* Test &, <, > in content with Tidy.
* Turn on "Cross-domain Receiver URL" in DISQUS settings.
* Make sure to use "--style compressed" with sass.
+* Think about google sitemap again.
+* Consider using feedburner vs my own alternate atom?
+ - Consider this XML too. https://github.com/metajack/metajack.im/blob/master/atom.xml

h1. Development Setup
@@ -27,7 +29,7 @@ Remember to add /opt/local/Library/Frameworks/Python.framework/Versions/2.6/bin

h1. License

-All blog content and images are Copyright (c) 2006-2011, Kenneth Todd Collins. Only jekyll plugins and helpers
are MIT Licensed.
+All blog content and images are Copyright (c) 2006-2011, Kenneth Todd Collins. Use is strictly forbidden unless
consent is given. Only jekyll plugins and helpers are MIT Licensed.


Update Readme.
# On branch master
#
# modified: README.textile
#
#
#
diff --git a/README.textile b/README.textile
index 9fa1b2c..e368e6d 100644
--- a/README.textile
+++ b/README.textile
@@ -3,10 +3,12 @@ h1. Todo

* Design
- Fixed Left Nav / Fat Bottom Area
-* Consider using feedburner vs my own alternate atom?
* Test &, <, > in content with Tidy.
* Turn on "Cross-domain Receiver URL" in DISQUS settings.
* Make sure to use "--style compressed" with sass.
+* Think about google sitemap again.
+* Consider using feedburner vs my own alternate atom?
+ - Consider this XML too. https://github.com/metajack/metajack.im/blob/master/atom.xml

h1. Development Setup
@@ -27,7 +29,7 @@ Remember to add /opt/local/Library/Frameworks/Python.framework/Versions/2.6/bin

h1. License

-All blog content and images are Copyright (c) 2006-2011, Kenneth Todd Collins. Only jekyll plugins and helpers
are MIT Licensed.
+All blog content and images are Copyright (c) 2006-2011, Kenneth Todd Collins. Use is strictly forbidden unless
consent is given. Only jekyll plugins and helpers are MIT Licensed.


Workflow
Example
(tangent patch)


# On branch some_feature
#
#
#
#
diff --git a/z_metadata/app/models/article.rb b/z_metadata/app/models/article.rb
index 5236f94..d259a29 100644
--- a/z_metadata/app/models/article.rb
+++ b/z_metadata/app/models/article.rb
@@ -30,7 +30,7 @@ class Article < Content
end

def jekyll_filename2
- "#{ymd_dirs('-')}-#{permalink}.html"
+ "#{ymd_dirs('-')}-#{permalink}"
end

def disqus_identifier


Patch jekyll filename suffix.
# On branch some_feature
#
#
#
#
diff --git a/z_metadata/app/models/article.rb b/z_metadata/app/models/article.rb
index 5236f94..d259a29 100644
--- a/z_metadata/app/models/article.rb
+++ b/z_metadata/app/models/article.rb
@@ -30,7 +30,7 @@ class Article < Content
end

def jekyll_filename2
- "#{ymd_dirs('-')}-#{permalink}.html"
+ "#{ymd_dirs('-')}-#{permalink}"
end

def disqus_identifier


Rebase
Topic Branches
(FTW)


function git-branch-name () {
git branch 2> /dev/null | grep "^*" | sed "s/^* //"
}

function grbm () {
branch=$(git-branch-name)
git checkout master
git pull origin master
git checkout "${branch}"
git rebase master
}

function grbmc () {
branch=$(git-branch-name)
grbm
git checkout master
git rebase "${branch}"
git push origin master
git checkout "${branch}"
}


TextMate


Code
Completion
(built-in)


ESC Key
* Case senstive matches.
* In same file.
* Toggle multiple matches.


http://code.leadmediapartners.com/

Command + ;
* Matches all open files!
* Contextual select menu!


Mac OS


Exposé,
Spaces


Shortcuts


1) Communication


1) Communication
Email, Campfire, Twitter,
iChat, Skype, IRC ...


1) Communication

2) Primary Work


1) Communication

2) Primary Work
Task At Hand, Day Job ...


1) Communication

2) Primary Work

3) Other Work


1) Communication

2) Primary Work

3) Other Work
Skunk Works ...


Three monitors are better
than one big one!


Three monitors are better
than one big one!

* Around 24” Middle Display
* Angle Left/Right Displays


Exposé In
Spaces!


Finder


Command-G In Any
File Dialog


Command-G In Any
File Dialog

* Tab Completion Too!


Alfred


Dock No.oh


Tool Time

Recommended

Recommended

More Related Content

What's hot

What's hot (10)

Viewers also liked

Viewers also liked (7)

Similar to Tool Time

Similar to Tool Time (20)

Recently uploaded

Recently uploaded (20)

Tool Time