diff options
| author |  Alex Henrie <alexhenrie24@gmail.com> | 2021-11-18 08:43:17 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-11-19 09:14:15 -0800 |
| commit | 71076d0edde43a7672a9a0f555753ff078602a64 (patch) | |
| tree | 9a8ba647ad68488c1f3725b3c8d432b5f6a1b02c /builtin/update-server-info.c | |
| parent | Merge branch 'vd/pthread-setspecific-g11-fix' into maint (diff) | |
| download | tgif-71076d0edde43a7672a9a0f555753ff078602a64.tar.xz | |
pull: don't say that merge is "the default strategy"
Git no longer has a default strategy for reconciling divergent branches,
because there's no way for Git to know which strategy is appropriate in
any particular situation.
The initially proposed version in [*], that eventually became
031e2f7a (pull: abort by default when fast-forwarding is not
possible, 2021-07-22), dropped this phrase from the message, but
it was left in the final version by accident.
* https://lore.kernel.org/git/20210627000855.530985-1-alexhenrie24@gmail.com/
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/update-server-info.c')
0 files changed, 0 insertions, 0 deletions