summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2021-07-22 05:04:48 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-07-22 18:54:29 (GMT)
commit031e2f7ae195069d00d21cde906fce5b0318dbdd (patch)
tree61c6b5cb09f65ab91fe17c72c7cdfc5d8213c5f0 /Documentation/git-merge.txt
parentadc27d6a9374d012b091bc348c20f5bfdbee52d1 (diff)
downloadgit-031e2f7ae195069d00d21cde906fce5b0318dbdd.zip
git-031e2f7ae195069d00d21cde906fce5b0318dbdd.tar.gz
git-031e2f7ae195069d00d21cde906fce5b0318dbdd.tar.bz2
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/git-merge.txt')
0 files changed, 0 insertions, 0 deletions