summaryrefslogtreecommitdiff
path: root/Documentation/gitfaq.txt
AgeCommit message (Expand)AuthorFilesLines
2021-08-05Update docs for change of default merge backendLibravatar Elijah Newren1-1/+1
2020-09-20docs: explain how to deal with files that are always modifiedLibravatar brian m. carlson1-0/+33
2020-09-20docs: explain why reverts are not always applied on mergeLibravatar brian m. carlson1-0/+21
2020-09-20docs: explain why squash merges are broken with long-running branchesLibravatar brian m. carlson1-0/+32
2020-05-26Merge branch 'ss/faq-ignore'Libravatar Junio C Hamano1-1/+1
2020-05-25gitfaq: avoid validation error with older asciidocLibravatar Todd Zullinger1-1/+1
2020-05-13Merge branch 'ss/faq-fetch-pull'Libravatar Junio C Hamano1-0/+8
2020-05-06gitfaq: fetching and pulling a repositoryLibravatar Shourya Shukla1-0/+8
2020-05-06gitfaq: files in .gitignore are trackedLibravatar Shourya Shukla1-0/+10
2020-03-30docs: add a FAQLibravatar brian m. carlson1-0/+337