mirror of
https://github.com/git/git.git
synced 2024-09-22 12:33:54 +02:00
Merge branch 'mm/status-push-pull-advise'
Finishing touch to allow the new advice message squelched with an advice.* configuration variable. * mm/status-push-pull-advise: status: respect advice.statusHints for ahead/behind advice
This commit is contained in:
commit
90ae9f259e
3
remote.c
3
remote.c
@ -1633,6 +1633,7 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb)
|
||||
"Your branch is ahead of '%s' by %d commits.\n",
|
||||
num_ours),
|
||||
base, num_ours);
|
||||
if (advice_status_hints)
|
||||
strbuf_addf(sb,
|
||||
_(" (use \"git push\" to publish your local commits)\n"));
|
||||
} else if (!num_ours) {
|
||||
@ -1643,6 +1644,7 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb)
|
||||
"and can be fast-forwarded.\n",
|
||||
num_theirs),
|
||||
base, num_theirs);
|
||||
if (advice_status_hints)
|
||||
strbuf_addf(sb,
|
||||
_(" (use \"git pull\" to update your local branch)\n"));
|
||||
} else {
|
||||
@ -1655,6 +1657,7 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb)
|
||||
"respectively.\n",
|
||||
num_theirs),
|
||||
base, num_ours, num_theirs);
|
||||
if (advice_status_hints)
|
||||
strbuf_addf(sb,
|
||||
_(" (use \"git pull\" to merge the remote branch into yours)\n"));
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user