The following is a basic command to continue (part of) a Subversion repository as a git repository.
Continue reading
Continue SVN history in a git repository
Leave a reply
Category Archives: Tips
Handling merge conflicts with git
Like a similar post for Mercurial, this tip tries to document a list of systematic steps to handle merge conflicts with git.
Continue reading
Bash Arrays
Arrays are the main advanced data structure in Bash, but the syntax can be hard to remember. The following list summarizes the main operations.
Continue reading
Makefile auto dependencies with GCC
There are many ways of having automatic dependencies in a Makefile. The following, however, is the most clean and complete solution that I know of for modern compilers.
Continue reading
The x264 encoding guide gives a nice explanation of the different options for H.264 encoding. Normally:
ffmpeg -i in.avi -strict experimental -crf 23 -preset medium out.m4v |
Where you can deviate from the above defaults:
- -crf [18-28]
- perceived output quality (lower crf is better quality)
- -preset [ultrafast,superfast,veryfast,faster,fast,medium,slow,slower,veryslow]
- compression effort (slower preset is better compression)
Joining H.264/AAC video files
It is possible to join H.264/AAC video files without re-enconding, if you convert them to an MPEG transport stream (TS). This format supports concatenation. Of course, the video files need to have the same height and width, aspect ratio,…
Continue reading
Using wget to mirror entire website folder
GNU wget can create a very usable local or offline mirror of an entire folder of a website using the following combination of options.
Continue reading
From Marshall Clow, how to get C++11 support with the bundled clang on Mac OS X:
clang++ -std=c++0x -stdlib=libc++ |
This will use the new libc++.
Generate certificate signing requests using OpenSSL
If you are going to request a CA to sign a certificate for you on a regular basis (i.e. certificates that expire after 1 or 2 years), then it is very useful to automate the process of creating a CSR and a private key with a configuration file.
Continue reading
Handling merge conflicts with Mercurial
When you encounter a merge conflict with Mercurial, things can get a little disorienting. The following is a practical list of steps to handle a merge conflict without getting lost.
Continue reading