Re: [PATCH v3 5/5] pull: add warning on non-ff merges

2013-09-08 Thread Felipe Contreras
On Sun, Sep 8, 2013 at 8:23 PM, Felipe Contreras wrote: > To prepare our uses for the upcoming changes we should warn them and let > them know that they will need to specify a merge or a rebase in the > future (when a non-fast-forward situation arises). Also, let them know > we fallback to 'git pu

[PATCH v3 5/5] pull: add warning on non-ff merges

2013-09-08 Thread Felipe Contreras
To prepare our uses for the upcoming changes we should warn them and let them know that they will need to specify a merge or a rebase in the future (when a non-fast-forward situation arises). Also, let them know we fallback to 'git pull --merge', so when the obsoletion of this mode comes, they know