On Thu, May 05, 2011 at 04:49:50PM -0700, Junio C Hamano wrote: > Pierre Habouzit <madcoder@xxxxxxxxxx> 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". okay it's really late, sorry, I read too fast, I'll work on something like that, doesn't looks too complicated ;) I'll post an updated patch on tomorrow. -- ÂOÂ Pierre Habouzit ÂÂO madcoder@xxxxxxxxxx OOO http://www.madism.org -- 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