Re: A tour of git: the basics (and notes on some unfriendly messages)

From: Junio C Hamano <gitster@pobox.com>
Date: Sep 30, 2007, 10:17 UTC
Message-ID: <7vr6kgh2yy.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <E8851B12-AAA5-4B4D-9F28-C5AB5AEF0E57@zib.de>

Steffen Prohaska <prohaska@zib.de> writes:

Show 7 quoted lines

> ... If everything's ok I do.
>
>    git checkout master
>    git merge for/master
>    git push
>
> The last merge must be a fast forward.

Last week I saw somebody (I think it was Shawn) mentioned a trick:

	git push . thisbranch:thatbranch

will moves thatbranch to thisbranch iff thisbranch is a descendant of thatbranch. So doing

	git push . for-master:master

instead of that checkout + merge command sequence would obviously be a good solution for your particular use case.

Having said that it may make sense to swap the order so that the diffstat is shown first and then a single line "Merge made by recursive" or "Updatting A..B, Fast Forward" concludes the report. At least, I do not think such a swapping would hurt the usability, although people used to the UI may first feel uneasy. I would not object to such a patch in principle.