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
! To load this config run:
! $ xmodmap .xmodmaprc
keycode 133 = Super_L
keycode 134 = Hyper_L
! keycode 135 = Menu
clear mod3
clear mod4
add mod3 = Super_L
add mod4 = Hyper_L
! Delete CapsLock (map to Ctrl).
clear Lock
clear Control
! keycode 66 = Caps_Lock
keysym Caps_Lock = Control_L
add Control = Control_L Control_R
keycode 94 = Mode_switch