Nicolas Pitre wrote: > On Thu, 21 Sep 2006, Shawn Pearce wrote: > >> I think its probably too late to change the UI[*1*] but I think >> it is definately an issue for folks learning Git. Calling push >> push, fetch fetch and fetch+merge pull is probably a design flaw. >> IMHO it probably should have been something like: >> >> Current Shoulda Been >> --------------- ---------------- >> git-push git-push >> git-fetch git-pull >> git-pull . foo git-merge foo >> git-pull git-pull --merge >> git-merge git-merge-driver >> >> in other words pull does the download and doesn't automatically >> start a merge unless --merge was also given and git-merge is a >> cleaner wrapper around the Grand Unified Merge Driver that makes >> it easier to start a merge. > > I must say that I second this. Although I'm rather familiar with GIT I > still feel unconfortable with the current naming and behavior. Using git-pull . <branch> for _merge_, and git-merge being mid-level command (one of the arguments is <msg>, instead of having git-commit like ways to provide/amend commit message) is somewhat confusing. -- Jakub Narebski Warsaw, Poland ShadeHawk on #git - 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