summaryrefslogtreecommitdiff
path: root/parse-options-cb.c
diff options
context:
space:
mode:
authorLibravatar brian m. carlson <sandals@crustytoothpaste.net>2020-09-20 23:22:29 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-09-20 21:29:02 -0700
commit5065ce412ef083a02288c1972ea3d07423cace0e (patch)
tree6f0f70d9cfa95ad850c39e5efa657f81711fa3e1 /parse-options-cb.c
parentFourteenth batch (diff)
downloadtgif-5065ce412ef083a02288c1972ea3d07423cace0e.tar.xz
docs: explain why squash merges are broken with long-running branches
In many projects, squash merges are commonly used, primarily to keep a tidy history in the face of developers who do not use logically independent, bisectable commits. As common as this is, this tends to cause significant problems when squash merges are used to merge long-running branches due to the lack of any new merge bases. Even very experienced developers may make this mistake, so let's add a FAQ entry explaining why this is problematic and explaining that regular merge commits should be used to merge two long-running branches. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'parse-options-cb.c')
0 files changed, 0 insertions, 0 deletions