diff options
| author | Alex Henrie <alexhenrie24@gmail.com> | 2023-07-13 06:41:14 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-07-13 18:14:58 +0200 |
| commit | d92304ff5cfdca463e9ecd1345807d0b46d6af33 (patch) | |
| tree | 4e79fcdfa923cda6679f00e93c9033f65e02f245 /kwset.c | |
| parent | wt-status: don't show divergence advice when committing (diff) | |
| download | git-d92304ff5cfdca463e9ecd1345807d0b46d6af33.tar.xz git-d92304ff5cfdca463e9ecd1345807d0b46d6af33.zip | |
remote: don't imply that integration is always required before pushing
In a narrow but common case, the user is the only author of a branch and
doesn't mind overwriting the corresponding branch on the remote. This
workflow is especially common on GitHub, GitLab, and Gerrit, which keep
a permanent record of every version of a branch that is pushed while a
pull request is open for that branch. On those platforms, force-pushing
is encouraged and is analogous to emailing a new version of a patchset.
When giving advice about divergent branches, tell the user about
`git pull`, but don't unconditionally instruct the user to do it. A less
prescriptive message will help prevent users from thinking that they are
required to create an integrated history instead of simply replacing the
previous history. Likewise, don't imply that `git pull` is only for
merging.
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'kwset.c')
0 files changed, 0 insertions, 0 deletions