| commit | 88d08c342af961c5fb57d7ea5f51233770f06639 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 25 Jul 2023 19:05:23 +0000 (25 12:05 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 25 Jul 2023 19:05:23 +0000 (25 12:05 -0700) | ||
| tree | dcc44c2f7942f3ab7e16126d986c9d6c799eaaf4 | treesnapshot (tar.gz zip) |
| parent | e43f4fd0bd864e0472dd4285190d411f4342e8d8 | commitdiff |
| parent | c577d65158aa78817a59a58649bb381f2daaa88d | commitdiff |
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
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
| builtin/checkout.c | diff1 | diff2 | blobhistory |
| builtin/push.c | diff1 | diff2 | blobhistory |
| remote.c | diff1 | diff2 | blobhistory |
| wt-status.c | diff1 | diff2 | blobhistory |