mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ah/advise-force-pushing'

Browse Source 
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
This commit is contained in:
Junio C Hamano
2023-07-25 12:05:23 -07:00
parent e43f4fd0bd c577d65158
commit 88d08c342a
6 changed files with 45 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wt-status.c
View File

@ -1186,7 +1186,8 @@ static void wt_longstatus_print_tracking(struct wt_status *s)
t_begin = getnanotime();
if (!format_tracking_info(branch, &sb, s->ahead_behind_flags))
if (!format_tracking_info(branch, &sb, s->ahead_behind_flags,
!s->commit_template))
return;
if (advice_enabled(ADVICE_STATUS_AHEAD_BEHIND_WARNING) &&