From: Junio C Hamano Date: Tue, 29 Sep 2020 21:01:19 +0000 (-0700) Subject: Merge branch 'bc/faq-misc' X-Git-Tag: v2.29.0-rc0~40 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c5a8f1efc03746fd6b6c71fef8e3a5c38ce4e2e8;p=thirdparty%2Fgit.git 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 --- c5a8f1efc03746fd6b6c71fef8e3a5c38ce4e2e8