Re: Cleaning up git user-interface warts

Alexandre Julliard wrote:

Jakub Narebski [off-list ref] writes:

quoted

Alexandre Julliard wrote:

quoted

Junio C Hamano [off-list ref] writes:

quoted

I would rather say "use 'git branch' to make sure if you are
ready to merge".  Who teaches not to use "git pull"?

We do that for Wine. The problem is that we recommend using git-rebase
to make it easier for occasional developers to keep a clean history,
and rebase and pull interfere badly.

What about proposed (and I think not accepted) merge strategy
"rebase" (formerly called "subordinate" or something like that)?

That sounds very interesting. Has it ever been implemented, or only
discussed?

There was some implementation with warts

  http://thread.gmane.org/gmane.comp.version-control.git/30068
  Message-Id: [ref]

which didn't got corrected and resent.
-- 
Jakub Narebski