tree 56602a5f803b271dfccb563d91b98a91e680679b
parent 9bc233ae1cf19a49e51842c7959d80a675dbd1c0
parent 087c61677c358091692ac6ce1de00bbfc9affdb1
author Junio C Hamano <gitster@pobox.com> 1601413279 -0700
committer Junio C Hamano <gitster@pobox.com> 1601413280 -0700

Merge branch 'bc/faq-misc'

More FAQ entries.

* bc/faq-misc:
  docs: explain how to deal with files that are always modified
  docs: explain why reverts are not always applied on merge
  docs: explain why squash merges are broken with long-running branches