]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e43f4fd c577d65)
Merge branch 'ah/advise-force-pushing'
authorJunio C Hamano <gitster@pobox.com>
Tue, 25 Jul 2023 19:05:23 +0000 (12:05 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 25 Jul 2023 19:05:23 +0000 (12:05 -0700)
commit88d08c342af961c5fb57d7ea5f51233770f06639
treedcc44c2f7942f3ab7e16126d986c9d6c799eaaf4tree
parente43f4fd0bd864e0472dd4285190d411f4342e8d8commit | diff
parentc577d65158aa78817a59a58649bb381f2daaa88dcommit | 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
builtin/checkout.c diff1 | diff2 | blob | history
builtin/push.c diff1 | diff2 | blob | history
remote.c diff1 | diff2 | blob | history
wt-status.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.