From: Jeff King <peff@peff.net>
To: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Junio C Hamano <gitster@pobox.com>, Johannes Sixt <j6t@kdbg.org>,
bill lam <cbill.lam@gmail.com>, git <git@vger.kernel.org>
Subject: Re: [PATCH v2] status: list unmerged files last
Date: Sat, 5 Sep 2009 05:04:22 -0400 [thread overview]
Message-ID: <20090905090422.GA13221@coredump.intra.peff.net> (raw)
In-Reply-To: <20090902183923.GA10581@rakim.wolfsonmicro.main>
On Wed, Sep 02, 2009 at 07:39:23PM +0100, Mark Brown wrote:
> My main wishlist would be to have the same control for the changes to be
> committed for the big merge case, the use case being while resolving
> merges where those changes are those that have been dealt with and the
> remaining (hopefully much fewer) changes are those that still need
> attention.
I think we need to be more concrete than that. What is the "big merge
case"? If there are any unmerged paths?
What exactly should be cut out, and how can it be configured? Should you
have "status.unmerged" to cut out certain things? Which things (of
staged, unstaged, and untracked)? Or should it go the other way, with a
status.showStaged variable which can be set to "always", "never", or
"unmerged" (and probably adding an "unmerged" option to
"status.showUntrackedFiles).
-Peff
next prev parent reply other threads:[~2009-09-05 9:04 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-01 14:52 unmerged files listed in the beginning of git-status bill lam
2009-09-01 16:42 ` Junio C Hamano
2009-09-01 19:40 ` Johannes Sixt
2009-09-01 20:13 ` [PATCH] status: list unmerged files after staged files Johannes Sixt
2009-09-01 20:38 ` Junio C Hamano
2009-09-01 21:25 ` [PATCH v2] status: list unmerged files last Johannes Sixt
2009-09-02 0:18 ` Junio C Hamano
2009-09-02 0:39 ` bill lam
2009-09-02 1:15 ` Jeff King
2009-09-02 4:26 ` Junio C Hamano
2009-09-02 5:12 ` Jeff King
2009-09-02 5:26 ` Junio C Hamano
2009-09-02 5:28 ` Jeff King
2009-09-02 10:07 ` David Aguilar
2009-09-02 17:59 ` Jeff King
2009-09-03 1:12 ` David Aguilar
2009-09-05 6:28 ` Jeff King
2009-09-05 8:48 ` Jeff King
2009-09-05 8:50 ` [PATCH/RFC 1/6] status: typo fix in usage Jeff King
2009-09-05 8:52 ` [PATCH/RFC 2/6] docs: note that status configuration affects only long format Jeff King
2009-09-06 8:04 ` Junio C Hamano
2009-09-05 8:53 ` [PATCH/RFC 3/6] status: refactor short-mode printing to its own function Jeff King
2009-09-06 8:05 ` Junio C Hamano
2009-09-05 8:54 ` [PATCH/RFC 4/6] status: refactor format option parsing Jeff King
2009-09-05 8:55 ` [PATCH/RFC 5/6] status: add --porcelain output format Jeff King
2009-09-05 8:59 ` [PATCH/RFC 6/6] commit: support alternate status formats Jeff King
2009-09-05 9:08 ` [PATCH v2] status: list unmerged files last Jeff King
2009-09-02 19:19 ` Johannes Sixt
2009-09-02 12:48 ` Mark Brown
2009-09-02 18:00 ` Jeff King
2009-09-02 18:39 ` Mark Brown
2009-09-05 9:04 ` Jeff King [this message]
2009-09-05 11:39 ` Mark Brown
2009-09-02 9:04 ` unmerged files listed in the beginning of git-status bill lam
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=20090905090422.GA13221@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=cbill.lam@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.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).