From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 05 May 2011 23:49:50 GMT
Subject: Re: [PATCH 1/1] status: display "doing what" information in git status
Message-ID: <7vr58c4sip.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20110505233925.GE636@madism.org>

Pierre Habouzit <madcoder@debian.org> writes:

>> As the "You are in middle of" information is useful mostly when you are on
>> detached head, I would have expected that the call would be inside the
>> if/elif chain near the top of wt_status_print() where we say "On branch"
>> vs "Not currently on...", to replace that information that comes from that
>> on_what variable.
>
> It's also useful when you're in the middle of a rebase or during a merge
> conflict who aren't on a detached head.

What I would expect in such a case would be like:

	# On branch master (resolving merge with ph/status)

instead of wasting an extra line like:

	# Resolving a merge conflict
        # On branch master

That is what I meant "to replace".