diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-09-29 14:01:19 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-09-29 14:01:20 -0700 |
commit | c5a8f1efc03746fd6b6c71fef8e3a5c38ce4e2e8 (patch) | |
tree | 56602a5f803b271dfccb563d91b98a91e680679b /Documentation/config/am.txt | |
parent | Seventeenth batch (diff) | |
parent | docs: explain how to deal with files that are always modified (diff) | |
download | tgif-c5a8f1efc03746fd6b6c71fef8e3a5c38ce4e2e8.tar.xz |
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
Diffstat (limited to 'Documentation/config/am.txt')
0 files changed, 0 insertions, 0 deletions