Philip Oakley wrote:
From: "David Kastrup" <redacted>
quoted
Marc Branchaud [off-list ref] writes:
quoted
To that end, I suggest that pull's default behaviour should be to do
*nothing*. It should just print out a message to the effect that it
hasn't been configured, and that the user should run "git help pull"
for guidance.
Fetching is uncontentious, and I _think_ that fast-forwards are pretty
uncontentious as well.
While the fast forward is /pretty/ uncontentious, it still maybe
contentious for some.
So? No defaults can please absolutely everyone, the best anybody can do
is try to please the majority of people, and merging fast-forwards only
does that.
--
Felipe Contreras