diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-07-25 22:05:23 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-07-25 22:05:23 +0300 |
| commit | 88d08c342af961c5fb57d7ea5f51233770f06639 (patch) | |
| tree | dcc44c2f7942f3ab7e16126d986c9d6c799eaaf4 /builtin/checkout.c | |
| parent | e43f4fd0bd864e0472dd4285190d411f4342e8d8 (diff) | |
| parent | c577d65158aa78817a59a58649bb381f2daaa88d (diff) | |
Merge branch 'ah/advise-force-pushing'
Help newbies by suggesting that there are cases where force-pushing
is a valid and sensible thing to update a branch at a remote
repository, rather than reconciling with merge/rebase.
* ah/advise-force-pushing:
push: don't imply that integration is always required before pushing
remote: don't imply that integration is always required before pushing
wt-status: don't show divergence advice when committing
Diffstat (limited to 'builtin/checkout.c')
| -rw-r--r-- | builtin/checkout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index 2ff9625644..f53612f468 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -916,7 +916,7 @@ static void report_tracking(struct branch_info *new_branch_info) struct strbuf sb = STRBUF_INIT; struct branch *branch = branch_get(new_branch_info->name); - if (!format_tracking_info(branch, &sb, AHEAD_BEHIND_FULL)) + if (!format_tracking_info(branch, &sb, AHEAD_BEHIND_FULL, 1)) return; fputs(sb.buf, stdout); strbuf_release(&sb); |