Re: [PATCH] status: list unmerged files after staged files
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:47:20
Possibly related (same subject, not in this thread)
- 2016-06-15 · [PATCH] status: list unmerged files after staged files · Johannes Sixt <hidden>
Johannes Sixt [off-list ref] writes:
Moreover, keeping the unmerge entries at the top is inconvenient if a merge touched many files, but only a few conflicted: After the conflicts were resolved, the user will conduct a 'git add' command. In order to do that with copy-and-paste, the user must scroll the terminal window up, and must do so for each individual entry (because terminal windows commonly scroll down automatically on the paste operation to make the cursor visible).
I actually was expecting that you would move this at the very bottom after untracked list for the above reason, and also because this part is only shown while running status (that was a good point you made in the previous message) and never in commit.
quoted hunk
Signed-off-by: Johannes Sixt <redacted> --- wt-status.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)diff --git a/wt-status.c b/wt-status.c index 3395456..85f3fcb 100644 --- a/wt-status.c +++ b/wt-status.c@@ -561,8 +561,8 @@ void wt_status_print(struct wt_status *s) color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "#"); } - wt_status_print_unmerged(s); wt_status_print_updated(s); + wt_status_print_unmerged(s); wt_status_print_changed(s); if (s->submodule_summary) wt_status_print_submodule_summary(s);-- 1.6.4.2.280.gb16ab