As configured in my dotfiles.
start new:
tmux
start new with session name:
As configured in my dotfiles.
start new:
tmux
start new with session name:
Locate the section for your github remote in the .git/config
file. It looks like this:
[remote "origin"]
fetch = +refs/heads/*:refs/remotes/origin/*
url = [email protected]:joyent/node.git
Now add the line fetch = +refs/pull/*/head:refs/remotes/origin/pr/*
to this section. Obviously, change the github url to match your project's URL. It ends up looking like this:
##git mergetool
In the middle file (future merged file), you can navigate between conflicts with ]c
and [c
.
Choose which version you want to keep with :diffget //2
or :diffget //3
(the //2
and //3
are unique identifiers for the target/master copy and the merge/branch copy file names).
:diffupdate (to remove leftover spacing issues)
:only (once you’re done reviewing all conflicts, this shows only the middle/merged file)
# to generate your dhparam.pem file, run in the terminal | |
openssl dhparam -out /etc/nginx/ssl/dhparam.pem 2048 |
/* | |
This program is an adaptation of the Mandelbrot program | |
from the Programming Rosetta Stone, see | |
http://rosettacode.org/wiki/Mandelbrot_set | |
Compile the program with: | |
gcc -o mandelbrot -O4 mandelbrot.c | |
Usage: |
$ diff -u /etc/nginx/nginx.conf{.ORIG,}
--- /etc/nginx/nginx.conf.ORIG 2014-04-13 04:15:51.907316500 +0000
+++ /etc/nginx/nginx.conf 2014-04-13 05:02:22.807316500 +0000
@@ -30,7 +30,9 @@
# Logging Settings
##
- access_log /var/log/nginx/access.log;
+ log_format vhosts '$host $remote_addr - $remote_user [$time_local] "$request" $status $body_bytes_sent "$http_referer" "$http_user_agent"';
server { | |
listen *:80; | |
root /usr/share/icingaweb2/public; | |
access_log /var/log/nginx/ssl-icingaweb2_app.access.log; | |
error_log /var/log/nginx/ssl-icingaweb2_app.error.log; | |
location ~ ^/icingaweb2(.+)? { | |
alias /usr/share/icingaweb2/public; | |
index index.php |