summaryrefslogtreecommitdiff
path: root/Documentation
AgeCommit message (Expand)AuthorFilesLines
2021-10-12Merge branch 'en/merge-strategy-docs' into maintLibravatar Junio C Hamano4-40/+53
2021-10-12Merge branch 'ab/bundle-doc' into maintLibravatar Junio C Hamano1-30/+117
2021-08-16Git 2.33Libravatar Junio C Hamano1-4/+0
2021-08-11Git 2.33-rc2Libravatar Junio C Hamano1-12/+0
2021-08-11Merge branch 'jn/log-m-does-not-imply-p'Libravatar Junio C Hamano1-4/+4
2021-08-09Revert 'diff-merges: let "-m" imply "-p"'Libravatar Jonathan Nieder1-4/+4
2021-08-05merge-strategies.txt: add coverage of the `ort` merge strategyLibravatar Elijah Newren1-0/+14
2021-08-05git-rebase.txt: correct out-of-date and misleading text about renamesLibravatar Elijah Newren1-3/+1
2021-08-05merge-strategies.txt: fix simple capitalization errorLibravatar Elijah Newren1-1/+1
2021-08-05merge-strategies.txt: avoid giving special preference to patience algorithmLibravatar Elijah Newren1-5/+1
2021-08-05merge-strategies.txt: do not imply using copy detection is desiredLibravatar Elijah Newren1-3/+3
2021-08-05merge-strategies.txt: update wording for the resolve strategyLibravatar Elijah Newren1-7/+6
2021-08-05Documentation: edit awkward references to `git merge-recursive`Libravatar Elijah Newren3-9/+9
2021-08-05directory-rename-detection.txt: small updates due to merge-ort optimizationsLibravatar Elijah Newren1-6/+8
2021-08-05git-rebase.txt: correct antiquated claims about --rebase-mergesLibravatar Elijah Newren1-6/+10
2021-08-04The eighth batchLibravatar Junio C Hamano1-1/+16
2021-08-04Merge branch 'ar/doc-markup-fix'Libravatar Junio C Hamano2-2/+2
2021-08-04Merge branch 'pb/merge-autostash-more'Libravatar Junio C Hamano1-1/+2
2021-08-04Merge branch 'ab/update-submitting-patches'Libravatar Junio C Hamano1-111/+96
2021-08-02bundle doc: replace "basis" with "prerequsite(s)"Libravatar Ævar Arnfjörð Bjarmason1-7/+7
2021-08-02bundle doc: elaborate on rev<->ref restrictionLibravatar Ævar Arnfjörð Bjarmason1-8/+38
2021-08-02bundle doc: elaborate on object prerequisitesLibravatar Ævar Arnfjörð Bjarmason1-3/+34
2021-08-02bundle doc: rewrite the "DESCRIPTION" sectionLibravatar Ævar Arnfjörð Bjarmason1-15/+41
2021-08-02Git 2.33-rc0Libravatar Junio C Hamano1-0/+17
2021-08-02Merge branch 'fc/pull-no-rebase-merges-theirs-into-ours'Libravatar Junio C Hamano1-1/+1
2021-08-02Merge branch 'jk/config-env-doc'Libravatar Junio C Hamano1-11/+17
2021-08-02Merge branch 'pb/submodule-recurse-doc'Libravatar Junio C Hamano1-2/+3
2021-07-30Documentation: render special characters correctlyLibravatar Andrei Rybak2-2/+2
2021-07-28The seventh batchLibravatar Junio C Hamano1-0/+43
2021-07-28Merge branch 'en/rename-limits-doc'Libravatar Junio C Hamano3-12/+21
2021-07-28Merge branch 'ds/gender-neutral-doc-guidelines'Libravatar Junio C Hamano1-0/+45
2021-07-28Merge branch 'dl/diff-merge-base'Libravatar Junio C Hamano1-3/+7
2021-07-28Merge branch 'sm/worktree-add-lock'Libravatar Junio C Hamano1-2/+2
2021-07-23Documentation: define 'MERGE_AUTOSTASH'Libravatar Philippe Blain1-1/+2
2021-07-22The sixth batchLibravatar Junio C Hamano1-0/+10
2021-07-22Merge branch 'bc/rev-list-without-commit-line'Libravatar Junio C Hamano1-0/+8
2021-07-22Merge branch 'ab/gitignore-discovery-doc'Libravatar Junio C Hamano1-6/+5
2021-07-22Merge branch 'ab/send-email-optim'Libravatar Junio C Hamano1-3/+0
2021-07-22Merge branch 'jk/typofix'Libravatar Junio C Hamano1-1/+1
2021-07-22SubmittingPatches: replace discussion of Travis with GitHub ActionsLibravatar Ævar Arnfjörð Bjarmason1-32/+17
2021-07-22SubmittingPatches: move discussion of Signed-off-by above "send"Libravatar Ævar Arnfjörð Bjarmason1-79/+79
2021-07-21doc: pull: fix rebase=false documentationLibravatar Felipe Contreras1-1/+1
2021-07-20doc: clarify description of 'submodule.recurse'Libravatar Philippe Blain1-2/+3
2021-07-20doc/git-config: simplify "override" advice for FILES sectionLibravatar Jeff King1-5/+4
2021-07-20doc/git-config: clarify GIT_CONFIG environment variableLibravatar Jeff King1-5/+6
2021-07-20doc/git-config: explain --file instead of referring to GIT_CONFIGLibravatar Jeff King1-1/+7
2021-07-16The fifth batchLibravatar Junio C Hamano1-0/+29
2021-07-16Merge branch 'ds/gender-neutral-doc'Libravatar Junio C Hamano3-6/+5
2021-07-16Merge branch 'ab/fetch-negotiate-segv-fix'Libravatar Junio C Hamano2-3/+13
2021-07-16CodingGuidelines: recommend gender-neutral descriptionLibravatar Junio C Hamano1-0/+45