[m-dev.] Merge commits

Peter Wang novalazy at gmail.com
Fri Jan 11 14:33:58 AEDT 2013


If you try to push some changes and git tells you that you're not up to
date, please use "git pull --rebase" (you can make it the default).
By default, "git pull" will merge, complicating the history (see gitk)
and making it harder to work with.


PS. git log -p --simplify-merges seems to DWIM

More information about the developers mailing list