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
This commit is contained in:
@ -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)
|
||||
|
||||
Reference in New Issue
Block a user