FileMerge (opendiff) can really come in handy when you need to visually compare merging conflicts. Other times it's just a nice visual way to review your days work.
The following method works by creating a simple bash script (git-diff-cmd.sh) that sets us up with the proper command line arguments for Git to pass off files to FileMerge.
In this document I am using Sass's SCSS syntax. You can choose to use the indented syntax in sass, if you prefer it, it has no functional differences from the SCSS syntax.
For Less, I'm using the JavaScript version because this is what they suggest on the website. The ruby version may be different.
| FILE SPACING: | |
| # double space a file | |
| sed G | |
| # double space a file which already has blank lines in it. Output file | |
| # should contain no more than one blank line between lines of text. | |
| sed '/^$/d;G' |
| <!DOCTYPE html> | |
| <meta charset=utf-8> | |
| <meta name=viewport content="width=device-width, initial-scale=1, maximum-scale=1"> | |
| <meta name=apple-mobile-web-app-capable content=yes> | |
| <meta name=apple-mobile-web-app-status-bar-style content=black> | |
| <title>Test fullscreen</title> | |
| <style> | |
| html, body { | |
| margin: 0; | |
| padding: 0; |
Sublime Text 2 ships with a CLI called subl (why not "sublime", go figure). This utility is hidden in the following folder (assuming you installed Sublime in /Applications like normal folk. If this following line opens Sublime Text for you, then bingo, you're ready.
open /Applications/Sublime\ Text\ 2.app/Contents/SharedSupport/bin/subl
You can find more (official) details about subl here: http://www.sublimetext.com/docs/2/osx_command_line.html
| iPad | |
| 1024 × 690 In landscape on iOS 4.3 | |
| 1024 × 672 In landscape on iOS 5 | |
| 768 × 946 In portrait on iOS 4.3 | |
| 768 × 928 In portrait on iOS 5 | |
| 1024 × 660 Always showing bookmarks bar in landscape on iOS 4.3 | |
| 1024 × 644 Always showing bookmarks bar in landscape on iOS 5 | |
| 768 × 916 Always showing bookmarks bar in portrait on iOS 4.3 |
| # Replace any brackets with real values | |
| # Try to ssh in to DREAMHOST (ensure it no longer asks for a PW); you may want to restart Terminal | |
| ssh [user]@[host] | |
| cd ~ | |
| mkdir [mydomain_com].git | |
| cd [mydomain_com].git | |
| git init --bare | |
| vi hooks/post-receive | |
| # Enter the code from the "post-receive" file (in this gist); save + quit |
| CREATE TABLE `mailinglist` ( `id` INT NOT NULL AUTO_INCREMENT , `email` TEXT NOT NULL, `user` TEXT NOT NULL , PRIMARY KEY ( `id` ) ) |
| <?php | |
| $data = $_POST['contact']; //get all fields (contact[full_name], etc) | |
| ksort($data); //sort the fields by name, so changing the order on HTML don't change the order in the spreadsheet | |
| $fileHandle = fopen('contact.csv', 'a'); //opens the contact.csv file, creates it if doesn't exist, place the cursor at the end of the file | |
| fputcsv($fileHandle, array($contact_data)); //write contact data to the end of the file |