Re: Cleaning up git user-interface warts

From: Junio C Hamano <junkio@cox.net>
Date: Nov 14, 2006, 22:50 UTC
Message-ID: <7virhhy76h.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <7vr6w5y7to.fsf@assigned-by-dhcp.cox.net>

Junio C Hamano <junkio@cox.net> writes:

Show 8 quoted lines

>  - I think it would be sensible to make remote tracking branches
>    less visible.  For example:
>...
>  - "git merge" to merge another branch into the current would
>    make sense.  "git pull . remotes/origin/next" is showing too
>    much implementation detail.  It should just be:
>
> 	git merge origin#next

This and other examples in "making remote tracking branches less visible" are hard to read because I used the word "origin" in two different sense. So here is a needed clarification.

If you have remotes/upstream that says:

	URL: git://git.xz/repo.git
        Pull: refs/heads/master:remotes/origin/master
        Pull: refs/heads/next:remotes/origin/next

Then, currently the users need to say:

	git diff remotes/origin/master
        git merge remotes/origin/next

By "making tracking branches less visible", what I mean is to let the users say this instead:

	git diff upstream
        git merge upstream#next