Understanding the Git Workflow

Summary:

If you’re fighting Git’s defaults, ask why.

Treat public history as immutable, atomic, and easy to follow. Treat private history as disposable and malleable.

The intended workflow is:

  • Create a private branch off a public branch.
  • Regularly commit your work to this private branch.
  • Once your code is perfect, clean up its history.
  • Merge the cleaned-up branch back into the public branch.

Full article by Benjamin Sandofsky here.

tags = { programming git } 1 note

Having the reduced syntax as optional is nice, and I can use only the small number of features I need without converting all my CSS files. I’ve been avoiding LESS for awhile, but might give Stylus a shot in some new projects.

Check out some examples on the Stylus Page on GitHub

(Source: vimeo.com)

tags = { programming css }

Red Teams: Crude Steganography with command line

redteams:

Jason’s post reminded me of another neat trick to have: using cat as a steganography tool to hide a RAR archive inside a simple jpg image.

The following will work on any Unix, including Mac OS X (for Windows see at the end of the post):

Step 1

Create a file with the data you want. Create a file with the data you want. You can use Jason’s trick to create an encrypted file…

Read More »

tags = { programming } source = redteams › 4 notes

Open, Edit & Save Encrypted Files with Vim and GPG

If you’ve ever want to save sensitive text on your computer - encrypting it is the only way to ensure it is secure. Using vim and gpg we can open, edit, and save only the encrypted file and leave nothing in plain text on the hard drive.

Note: In order to run gpg on OS X, you’ll need to first install MacGPG2.

To Open an Encrypted File (from shell)

gpg -d myfile.mkdn.gpg | vim - -n -i "NONE" "+set filetype=markdown"
  • -d to decrypt
  • | pipe stdout of gpg into vim
  • - to accept stdin instead of file
  • -n turns off swap file - important!
  • -i turns off .viminfo - important!
  • +set filetype set the file type (for syntax highlighting, etc) since there is no file name for vim to detect

Bonus: Add a function (and easy alias) to your ~/.bash_profile file:

vimdecrypt() { gpg -d "$1" | vim - -n -i "NONE" "+set filetype=$2"; }
alias vd="vimdecrypt"

You can now simply type (2nd argument optional):

$ vd myfile.mkdn.gpg markdown

To Save and Encrypt a File (from vim)

:w !gpg -c -o myfile.mkdn.gpg
  • :w to write buffer
  • !gpg escape to shell and run gpg, accepts vim buffer as stdin
  • -c to set symetric encryption
  • -o to set file name

Bonus: Add a command to your ~/.vimrc file:

command -nargs=1 WriteEncrypted w !gpg -c -o <q-args>

Now, from within vim you type

WriteEncrypted myfile.txt.gpg
tags = { encryption programming security vim unix bash gpg } 10 notes
“Most inventors and engineers I’ve met are like me … they live in their heads. They’re almost like artists. In fact, the very best of them are artists. And artists work best alone …. I’m going to give you some advice that might be hard to take. That advice is: Work alone… Not on a committee. Not on a team.”
slantback.: Open-plan Offices Suck — Privacy Makes Us Productive at Farnam Street  
tags = { programming business } source = slantback › 3 notes
Slider.js - Slideshow with jQuery, CSS Transitions and Canvas The canvas transitions are definitely the most interesting to me, and this provides nice wrapper code to create custom canvas animation functions. Performance appears to be a huge advantage over CSS. View demo on the project page

Slider.js - Slideshow with jQuery, CSS Transitions and Canvas

The canvas transitions are definitely the most interesting to me, and this provides nice wrapper code to create custom canvas animation functions. Performance appears to be a huge advantage over CSS.

View demo on the project page

tags = { javascript tech programming graphics } 4 notes High Res ›
“Je n’ai fait celle-ci plus longue que parce que n’ai pas eu le loisir de la faire plus courte.”
Blaise Pascal, 1657

(Source: en.wikiquote.org)

tags = { quotes programming code } 10 notes
Gundo - Visualize your Vim Undo Tree From the homepage: “You know that Vim lets you undo changes like any text editor. What you might not know is that it doesn&#8217;t just keep a list of your changes — it keeps a goddamed tree of them. Gundo is a plugin to make browsing this ridiculously powerful undo tree less painful.” Definitely exceeded my expectations and is becoming one of my favorite plugins. Building in a diff view is genius. Gundo on Bitbucket

Gundo - Visualize your Vim Undo Tree

From the homepage:

“You know that Vim lets you undo changes like any text editor. What you might not know is that it doesn’t just keep a list of your changes — it keeps a goddamed tree of them.

Gundo is a plugin to make browsing this ridiculously powerful undo tree less painful.”

Definitely exceeded my expectations and is becoming one of my favorite plugins. Building in a diff view is genius.

Gundo on Bitbucket

tags = { vim code programming } 45 notes
andrew: Nifty Git Cheatsheet Visualization.

andrew:

Nifty Git Cheatsheet Visualization.

tags = { programming } source = andrew › 41 notes High Res ›

Raphael JS

Amazing framework for SVG in a browser.

Advantages over canvas include DOM scripting, scaling, and events support to help with interactive animations.

tags = { programming javascript }

[ Python & Ruby Log ]
Author: Jason R Seney

Key: [+ good] [- bad] [~ indifferent]

_____( Python )____

+ Exellent scientific computation libraries
- No syntatic markup, just indents
+ Tons of built in functionality
+ Consise code
+ Easy imports
+ Has automatic enumeration with ” for i in array: “
~ Many functions are global for type “casting”
ex: str(x) where x=4 , len(myList) where myList = [1,2,3]


_____( Ruby )_____

+ Interactive mode usefull for quick tests of code
+ AWSOME Regex support! Sooo easy to use and get back references
ex. “This is a test”.match(/(\w+) (\w+)) puts x[0] puts x[1]
- No support for incrementors/decrementors ( “n++” or “—i” etc)
- Can use {} or “do … end” or “if … end” which leads to inconsistancy
- Uses blocks instead of for(int i=0; i

tags = { python ruby code programming }