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/bashif [[ -f ~/.env ]]; then . ~/.envfi# Load custom settings (user editable).if [[ -f ~/.env.local ]]; then . ~/.env.localfiif [[ -f ~/.Xdefaults ]]; then xrdb -merge ~/.Xdefaults # xrdb -load ~/.Xdefaultsfi# Under Cygwin I prefer '-multiwindow' option, so it needn't to setup WM.if [[ -z $COMSPEC ]]; then { setxkbmap us,ru,ua kbdd if [[ -f ~/.xmodmaprc ]]; then xmodmap ~/.xmodmaprc & fi } & xsetroot -mod 2 2 -fg gray70 -bg gray60 & # To debug FvwmM4 add "-debug" after "FvwmM4". fvwm -cmd "Module FvwmM4 -m4-prefix -m4-prefix-defines $HOME/.fvwm/config" & emacs --name emacs-main & goldendict & firefox & notfy_daemon_cmd=/usr/lib/notification-daemon/notification-daemon if [[ -x $notfy_daemon_cmd ]]; then $notfy_daemon_cmd & fifiif command -v xscreensaver; then xscreensaver -nosplash &fi# Disable beeping.if command -v xset; then xset -b &fi# Last command.exec xterm -geometry 80x42 -name "xinitrc" -title "*** xinitrc ***" -bg bisque -e bash -i