This is a vimdiff cheat sheet as a git mergetool.
]c - go to next difference
<?php | |
// Use in the "Post-Receive URLs" section of your GitHub repo. | |
if ( $_POST['payload'] ) { | |
shell_exec( 'cd /srv/www/git-repo/ && git reset --hard HEAD && git pull' ); | |
} | |
?>hi |
global | |
maxconn 4096 # Total Max Connections. This is dependent on ulimit | |
nbproc 2 | |
log 127.0.0.1 local1 notice | |
defaults | |
mode http | |
log global | |
frontend all 0.0.0.0:80 |
{ | |
// The command to execute for the terminal, leave blank for the OS default | |
// On OS X the terminal can be set to iTerm.sh to execute iTerm | |
"terminal": "C:\\Windows\\System32\\cmd.exe", | |
// A list of default parameters to pass to the terminal, this can be | |
// overridden by passing the "parameters" key with a list value to the args | |
// dict when calling the "open_terminal" or "open_terminal_project_folder" | |
// commands | |
"parameters": ["/c sh --login -i"] |
<?php | |
// Use in the "Post-Receive URLs" section of your Bitbucket repo. | |
if ( $_POST['payload'] ) { | |
$data = json_decode($_POST['payload']); | |
$commits = $data->{"commits"}; | |
#!/usr/bin/env bash | |
echo "I'm sorry Ishikawa-san." | |
echo "I'm sorry Ishikawa-san." | |
echo "I'm sorry Ishikawa-san." | |
sed --follow-symlinks -i 's;SELINUX=enforcing;SELINUX=disabled;g' /etc/sysconfig/selinux | |
setenforce 0 |
# GIT / GIT FLOW ALIASES | |
alias gs="git stash" | |
alias gsa="git stash apply" | |
alias gsl="git stash list" | |
alias gsc="git stash clear" | |
alias gft="git fetch --tags" | |
alias gpt="git push --tags" | |
alias gcm="git checkout master" |
#!/bin/bash | |
# | |
# You can set up sSMTP by setting the following ENV variables: | |
# | |
# SSMTP_TO - This is the address alarms will be delivered to. | |
# SSMTP_SERVER - This is your SMTP server. Defaults to smtp.gmail.com. | |
# SSMTP_PORT - This is the SMTP server port. Defaults to 587. | |
# SSMTP_USER - This is your username for the SMTP server. | |
# SSMTP_PASS - This is your password for the SMTP server. Use an app password if using Gmail. | |
# SSMTP_TLS - Use TLS for the connection. Defaults to YES. |
<?php | |
// そのままでは動きません | |
if (!defined('XOOPS_ROOT_PATH')) { | |
exit(); | |
} | |
class EncryptSha1Password extends XCube_ActionFilter | |
{ | |
public function preFilter() | |
{ |
chrome_ev: | |
gcc -o chrome_ev chrome_ev.cc |