Download the package: http://www2.futureware.at/~nickoe/msys2-mirror/msys/x86_64/rsync-3.1.2-2-x86_64.pkg.tar.xz
Extract it and move rsync.exe
to %HOMEDRIVE%%HOMEPATH%\AppData\Local\Programs\Git\usr\bin
.
Download the package: http://www2.futureware.at/~nickoe/msys2-mirror/msys/x86_64/rsync-3.1.2-2-x86_64.pkg.tar.xz
Extract it and move rsync.exe
to %HOMEDRIVE%%HOMEPATH%\AppData\Local\Programs\Git\usr\bin
.
#!/bin/bash | |
echo "Recreating docker iptables rules and chains" | |
echo "iptables -N DOCKER" | |
echo "iptables -N DOCKER-ISOLATION" | |
echo "iptables -t nat -N DOCKER" | |
echo "iptables -A DOCKER-ISOLATION -j RETURN" | |
echo "iptables -A FORWARD -j DOCKER-ISOLATION" | |
echo "iptables -t nat -A PREROUTING -m addrtype -dst-type LOCAL -j DOCKER" |
#!/bin/bash | |
# | |
# Purpose: manually associate missed renames in merge conflicts | |
# | |
# Usage: git merge-associate <our-target> <base> <theirs> | |
# | |
# Example: After a failed rename detection A/a -> B/b which results | |
# in CONFLICT (delete/modify) for A/a and corresponding "deleted by us" | |
# messages in git status, the following invocation can be used to manually | |
# establish the link: |