diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-07-19 20:30:23 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-07-19 20:30:23 +0200 |
commit | 7b098429355bb3271f9ffdf73b97f2ef82794fea (patch) | |
tree | 106f93b85ed9a429b0088b1b62d62f0775291189 /wt-status.c | |
parent | Merge branch 'pw/rebase-progress-test-cleanup' (diff) | |
parent | status: remove the empty line after hints (diff) | |
download | git-7b098429355bb3271f9ffdf73b97f2ef82794fea.tar.xz git-7b098429355bb3271f9ffdf73b97f2ef82794fea.zip |
Merge branch 'jl/status-reduce-vertical-blank'
Extra blank lines in "git status" output have been reduced.
* jl/status-reduce-vertical-blank:
status: remove the empty line after hints
Diffstat (limited to 'wt-status.c')
-rw-r--r-- | wt-status.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/wt-status.c b/wt-status.c index 7d776f8a97..9f6c65a580 100644 --- a/wt-status.c +++ b/wt-status.c @@ -202,7 +202,6 @@ static void wt_longstatus_print_unmerged_header(struct wt_status *s) } else { status_printf_ln(s, c, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)")); } - status_printf_ln(s, c, "%s", ""); } static void wt_longstatus_print_cached_header(struct wt_status *s) @@ -224,7 +223,6 @@ static void wt_longstatus_print_cached_header(struct wt_status *s) s->reference); } else status_printf_ln(s, c, _(" (use \"git rm --cached <file>...\" to unstage)")); - status_printf_ln(s, c, "%s", ""); } static void wt_longstatus_print_dirty_header(struct wt_status *s, @@ -243,7 +241,6 @@ static void wt_longstatus_print_dirty_header(struct wt_status *s, status_printf_ln(s, c, _(" (use \"git restore <file>...\" to discard changes in working directory)")); if (has_dirty_submodules) status_printf_ln(s, c, _(" (commit or discard the untracked or modified content in submodules)")); - status_printf_ln(s, c, "%s", ""); } static void wt_longstatus_print_other_header(struct wt_status *s, @@ -255,7 +252,6 @@ static void wt_longstatus_print_other_header(struct wt_status *s, if (!s->hints) return; status_printf_ln(s, c, _(" (use \"git %s <file>...\" to include in what will be committed)"), how); - status_printf_ln(s, c, "%s", ""); } static void wt_longstatus_print_trailer(struct wt_status *s) |