summaryrefslogtreecommitdiff
path: root/Documentation/gitfaq.txt
Commit message (Expand)AuthorAgeFilesLines
* Update docs for change of default merge backendElijah Newren2021-08-051-1/+1
* docs: explain how to deal with files that are always modifiedbrian m. carlson2020-09-201-0/+33
* docs: explain why reverts are not always applied on mergebrian m. carlson2020-09-201-0/+21
* docs: explain why squash merges are broken with long-running branchesbrian m. carlson2020-09-201-0/+32
* Merge branch 'ss/faq-ignore'Junio C Hamano2020-05-261-1/+1
|\
| * gitfaq: avoid validation error with older asciidocTodd Zullinger2020-05-251-1/+1
* | Merge branch 'ss/faq-fetch-pull'Junio C Hamano2020-05-131-0/+8
|\ \ | |/ |/|
| * gitfaq: fetching and pulling a repositoryShourya Shukla2020-05-061-0/+8
* | gitfaq: files in .gitignore are trackedShourya Shukla2020-05-061-0/+10
|/
* docs: add a FAQbrian m. carlson2020-03-301-0/+337