- Configure git.
# ~/.config/git/config
[sendemail]
confirm = auto
smtpServer = smtp.gmail.com
smtpServerPort = 587
smtpEncryption = tls
smtpUser = <gmail email address>
/* | |
Copyright (c) 2008 ArtemGr | |
Permission to use, copy, modify, and/or distribute this software for any | |
purpose with or without fee is hereby granted, provided that the above | |
copyright notice and this permission notice appear in all copies. | |
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES | |
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF | |
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR |
átírtuk, kicsit talán vállalhatóbb: http://github.com/gazs/mr2akusztik |
Date: Wed, 14 Mar 2012 17:45:05 +0200 | |
Subject: [PATCH] git svn dcommit: avoid self-referential mergeinfo | |
When svn.pushmergeinfo is configured, git svn dcommit tries to automatically populate svn:mergeinfo properties by merging the parent branch's mergeinfo into the committed one on each merge commit. This process can add self-referential mergeinfo lines, i.e. ones that reference the same branch being committed into (e.g. when reintegrating a branch to trunk after previously having merged trunk into it), which are then mishandled by SVN and cause errors in mixed SVN/Git environments. | |
For more details, see my original report on the issue at [1]. | |
This commit adds a step to git svn dcommit that filters out any mergeinfo lines referencing the target branch from the mergeinfo, thus avoiding the problem. | |
[1] http://thread.gmane.org/gmane.comp.version-control.git/191932 |
# ~/.config/git/config
[sendemail]
confirm = auto
smtpServer = smtp.gmail.com
smtpServerPort = 587
smtpEncryption = tls
smtpUser = <gmail email address>
echo "this file isn't supposed to run" | |
exit 0 | |
# <------------------------------ Enviroment Variables -------------------------------> | |
FQDN = <Server DNS Name> # can also get from PTR record | |
ORG_NAME = <Org name> | |
RELEASE_NAME = $(lsb_release -sc) | |
# <------------------------------ Network Stack Setups -------------------------------> | |
# Please edit /etc/default/ufw first |
# This is just a cheat sheet: | |
# On production | |
sudo -u postgres pg_dump database | gzip -9 > database.sql.gz | |
# On local | |
scp -C production:~/database.sql.gz | |
dropdb database && createdb database | |
gunzip < database.sql.gz | psql database |
No, seriously, don't. You're probably reading this because you've asked what VPN service to use, and this is the answer.
Note: The content in this post does not apply to using VPN for their intended purpose; that is, as a virtual private (internal) network. It only applies to using it as a glorified proxy, which is what every third-party "VPN provider" does.
#!/usr/bin/env bash | |
# Script to (selectively) save/load multiple Docker images to/from a directory. | |
# Run ./save-load-docker-images.sh for help. | |
set -e | |
directory=$PWD | |
filter="" | |
compress=0 |
#!/bin/bash | |
# Prerequisites: http://wiki.openwrt.org/doc/howto/buildroot.exigence | |
# Additionally JDK is needed | |
generate_buildenv() { | |
# Prepare build enviroment | |
mkdir lede_build | |
cd lede_build | |
git clone https://github.com/lede-project/source.git |
private static OkHttpClient getUnsafeOkHttpClient() { | |
try { | |
// Create a trust manager that does not validate certificate chains | |
final TrustManager[] trustAllCerts = new TrustManager[]{ | |
new X509TrustManager() { | |
@Override | |
public void checkClientTrusted(java.security.cert.X509Certificate[] chain, | |
String authType) throws CertificateException { | |
} |