From: Junio C Hamano <gitster@pobox.com>
To: Pierre Habouzit <madcoder@debian.org>
Cc: Junio C Hamano <gitster@pobox.com>, Git ML <git@vger.kernel.org>
Subject: Re: [PATCH 1/1] status: display "doing what" information in git status
Date: Thu, 05 May 2011 16:49:50 -0700 [thread overview]
Message-ID: <7vr58c4sip.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20110505233925.GE636@madism.org> (Pierre Habouzit's message of "Fri, 6 May 2011 01:39:25 +0200")
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".
next prev parent reply other threads:[~2011-05-05 23:50 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-05 21:48 [PATCH 1/1] status: display "doing what" information in git status Pierre Habouzit
2011-05-05 23:06 ` Sverre Rabbelier
2011-05-05 23:26 ` Pierre Habouzit
2011-05-06 7:48 ` Michael J Gruber
2011-05-06 8:04 ` Pierre Habouzit
2011-05-05 23:37 ` Junio C Hamano
2011-05-05 23:39 ` Pierre Habouzit
2011-05-05 23:47 ` Pierre Habouzit
2011-05-05 23:49 ` Junio C Hamano [this message]
2011-05-05 23:51 ` Pierre Habouzit
2011-05-06 7:38 ` [PATCH v2] " Pierre Habouzit
2011-05-06 10:13 ` Jakub Narebski
2011-05-06 17:40 ` Pierre Habouzit
2011-05-06 17:29 ` Junio C Hamano
2011-05-06 17:36 ` Pierre Habouzit
2011-05-06 18:24 ` Junio C Hamano
2011-05-06 18:40 ` Matthieu Moy
2011-05-06 18:44 ` Pierre Habouzit
2011-05-06 19:15 ` Matthieu Moy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vr58c4sip.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=madcoder@debian.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).