New git on "git pull" asked to config one of:
git config pull.rebase false # merge (the default strategy)
git config pull.rebase true # rebase
git config pull.ff only # fast-forward only
#!/bin/sh
# http://tldp.org/HOWTO/XWindow-User-HOWTO/runningx.html
if [ -n "$WINDIR" -o "$TERM" = cygwin ]; then
# Probably under Cygwin.
exec XWin -multiwindow -clipboard -silent-dup-error -xkblayout "us,ru" -xkboptions "grp:caps_toggle" "$@"
elif [ -f /etc/debian_version ]; then
exec /usr/bin/X -nolisten tcp "$@"
else
exec X -nolisten tcp "$@"
fi