Thread (12 messages) flat view 12 messages, 5 authors, 2016-06-15

Re: [PATCH v2] status: list unmerged files last

From: Jeff King <hidden>
Date: 2016-06-15 22:47:21

Possibly related (same subject, not in this thread)

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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help