From mboxrd@z Thu Jan 1 00:00:00 1970 From: Johannes Sixt Subject: [PATCH] status: list unmerged files after staged files Date: Tue, 1 Sep 2009 22:13:53 +0200 Message-ID: <200909012213.54611.j6t@kdbg.org> References: <20090901145213.GB4194@debian.b2j> <7vljkypqfi.fsf@alter.siamese.dyndns.org> <200909012140.08953.j6t@kdbg.org> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Cc: bill lam , git To: Junio C Hamano X-From: git-owner@vger.kernel.org Tue Sep 01 22:14:08 2009 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1MiZjy-0003Lj-EH for gcvg-git-2@lo.gmane.org; Tue, 01 Sep 2009 22:14:06 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754043AbZIAUN5 (ORCPT ); Tue, 1 Sep 2009 16:13:57 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752080AbZIAUN4 (ORCPT ); Tue, 1 Sep 2009 16:13:56 -0400 Received: from bsmtp.bon.at ([213.33.87.14]:21792 "EHLO bsmtp.bon.at" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751842AbZIAUN4 (ORCPT ); Tue, 1 Sep 2009 16:13:56 -0400 Received: from dx.sixt.local (unknown [93.83.142.38]) by bsmtp.bon.at (Postfix) with ESMTP id 90A3AA7EB2; Tue, 1 Sep 2009 22:13:57 +0200 (CEST) Received: from localhost (localhost [IPv6:::1]) by dx.sixt.local (Postfix) with ESMTP id E87BC5BB20; Tue, 1 Sep 2009 22:13:56 +0200 (CEST) User-Agent: KMail/1.9.9 In-Reply-To: <200909012140.08953.j6t@kdbg.org> Content-Disposition: inline Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: The list of unmerged files is considered rather important because after a conflicted merge they need attention. Since the output of git status does not go through the pager, the end of the output remains immediately visible in the terminal window. By placing unmerge entries after staged entries, the user can see them immediately. 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). Signed-off-by: Johannes Sixt --- 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