My simple strategy was to avoid fast-forward on merge and to use "git pull --rebase" when my changes are not critical. History rewriting? Hum I do not know....

My simple strategy was to avoid fast-forward on merge and to use "git pull --rebase" when my changes are not critical. History rewriting? Hum I do not know....I do not like changing history