summaryrefslogtreecommitdiff
path: root/RelNotes
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-04-08 14:29:11 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-04-08 14:29:11 -0700
commitd04aa7ec4738f90220b9e205326f17938b8f89d4 (patch)
tree7be435da616d58dec183f8c6c8f1517819a2a626 /RelNotes
parentSecond batch for post 2.8 cycle (diff)
parentmerge: refuse to create too cool a merge by default (diff)
downloadtgif-d04aa7ec4738f90220b9e205326f17938b8f89d4.tar.xz
Merge branch 'jc/merge-refuse-new-root'
"git merge" used to allow merging two branches that have no common base by default, which led to a brand new history of an existing project created and then get pulled by an unsuspecting maintainer, which allowed an unnecessary parallel history merged into the existing project. The command has been taught not to allow this by default, with an escape hatch "--allow-unrelated-histories" option to be used in a rare event that merges histories of two projects that started their lives independently. * jc/merge-refuse-new-root: merge: refuse to create too cool a merge by default
Diffstat (limited to 'RelNotes')
0 files changed, 0 insertions, 0 deletions