diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-09-29 23:01:19 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-09-29 23:01:20 +0200 |
| commit | c5a8f1efc03746fd6b6c71fef8e3a5c38ce4e2e8 (patch) | |
| tree | 56602a5f803b271dfccb563d91b98a91e680679b /diff.h | |
| parent | Seventeenth batch (diff) | |
| parent | docs: explain how to deal with files that are always modified (diff) | |
| download | git-c5a8f1efc03746fd6b6c71fef8e3a5c38ce4e2e8.tar.xz git-c5a8f1efc03746fd6b6c71fef8e3a5c38ce4e2e8.zip | |
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 'diff.h')
0 files changed, 0 insertions, 0 deletions