diff options
| author |  Elijah Newren <newren@gmail.com> | 2021-07-22 05:04:48 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-07-22 11:54:29 -0700 |
| commit | 031e2f7ae195069d00d21cde906fce5b0318dbdd (patch) | |
| tree | 61c6b5cb09f65ab91fe17c72c7cdfc5d8213c5f0 /Documentation/merge-options.txt | |
| parent | pull: make --rebase and --no-rebase override pull.ff=only (diff) | |
| download | tgif-031e2f7ae195069d00d21cde906fce5b0318dbdd.tar.xz | |
pull: abort by default when fast-forwarding is not possible
We have for some time shown a long warning when the user does not
specify how to reconcile divergent branches with git pull. Make it an
error now.
Initial-patch-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions