Le 31/05/15 16:19, Georg Baum a écrit :
Git has upset me many times as well. The default behaviour is almost always not what you want, so for the command line version you have to give some options (which I keep forgetting as well), and I guess this is similar in the GUI clients you use.
Note that you can use 'git config' to set some options as default. I do that to do rebase instead of merge on pull by default, for example.
Updating git is also a good idea, since there is an effort to use more sensible defaults, AFAICS.
JMarc
