summaryrefslogtreecommitdiff
path: root/wt-status.c
diff options
context:
space:
mode:
authorJohannes Sixt <j6t@kdbg.org>2009-09-01 20:13:53 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-09-02 05:29:51 (GMT)
commit228e7b5d4d6eca8616c7dc3d979478909dbdbfd1 (patch)
tree790b06003868c0da2365a70d695ea488b75eff48 /wt-status.c
parent0b1fac320c10b83133f824805055ff428b331e19 (diff)
downloadgit-228e7b5d4d6eca8616c7dc3d979478909dbdbfd1.zip
git-228e7b5d4d6eca8616c7dc3d979478909dbdbfd1.tar.gz
git-228e7b5d4d6eca8616c7dc3d979478909dbdbfd1.tar.bz2
status: list unmerged files much later
When resolving a conflicted merge, two lists in the status output need more attention from the user than other parts. - the list of updated paths is useful to review the amount of changes the merge brings in (the user cannot do much about them other than reviewing, though); and - the list of unmerged paths needs the most attention from the user; the user needs to resolve them in order to proceed. Since the output of git status does not by default go through the pager, the early parts of the output can scroll away at the top. It is better to put the more important information near the bottom. During a merge, local changes that are not in the index are minimum, and you should keep the untracked list small in any case, so moving the unmerged list from the top of the output to immediately after the list of updated paths would give us the optimum layout. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'wt-status.c')
-rw-r--r--wt-status.c2
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);