On Wed, 15 Nov 2006, Carl Worth wrote:
Well, one of the problems is that with current git I can teach, (and I
have), that there's a conceptual:
pull = fetch + merge
But then shortly after I have to teach an interface notion:
merge = pull .
So there's this goofy circular notion that people end up with
mentally. If we fix it so that a local merge really is performed with
"git merge <branch>" instead of "git pull . <branch>" then teaching
pull=fetch+merge really is a lot easier.
On a conceptual level, can we not perhaps explain that if
pull = fetch + merge
then
merge = pull - fetch
and that the latter (pull - fetch) happens to be expressed with the
interface as 'git pull .' ?
My 2 cents.
Jérôme
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html