summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ab/help-config-vars'Junio C Hamano2021-10-131-4/+5
|\
| * help: correct logic error in combining --all and --configÆvar Arnfjörð Bjarmason2021-09-231-0/+1
| * help: correct usage & behavior of "git help --guides"Ævar Arnfjörð Bjarmason2021-09-231-3/+3
| * help: correct the usage string in -h and documentationÆvar Arnfjörð Bjarmason2021-09-101-1/+1
* | Merge branch 'jh/builtin-fsmonitor-part1'Junio C Hamano2021-10-131-0/+40
|\ \
| * | trace2: add trace2_child_ready() to report on background childrenJeff Hostetler2021-09-201-0/+40
* | | Merge branch 'en/removing-untracked-fixes'Junio C Hamano2021-10-133-22/+9
|\ \ \
| * | | Documentation: call out commands that nuke untracked files/directoriesElijah Newren2021-09-273-5/+8
| * | | read-tree, merge-recursive: overwrite ignored files by defaultElijah Newren2021-09-271-17/+1
| * | | Merge branch 'en/am-abort-fix' into en/removing-untracked-fixesJunio C Hamano2021-09-201-0/+2
| |\ \ \ | | |/ / | |/| |
* | | | Merge branch 'ds/add-rm-with-sparse-index'Junio C Hamano2021-10-132-1/+14
|\ \ \ \
| * | | | rm: add --sparse optionDerrick Stolee2021-09-281-0/+6
| * | | | add: implement the --sparse optionDerrick Stolee2021-09-281-1/+8
* | | | | Sync with Git 2.33.1Junio C Hamano2021-10-122-75/+138
|\ \ \ \ \
| * | | | | Git 2.33.1v2.33.1Junio C Hamano2021-10-121-0/+138
| * | | | | Merge branch 'cb/cvsserver' into maintJunio C Hamano2021-10-121-14/+13
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'en/am-abort-fix' into maintJunio C Hamano2021-10-121-0/+2
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | Merge branch 'jk/log-warn-on-bogus-encoding' into maintJunio C Hamano2021-10-122-3/+5
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'ka/want-ref-in-namespace' into maintJunio C Hamano2021-10-121-5/+9
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'sg/column-nl' into maintJunio C Hamano2021-10-121-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'rs/branch-allow-deleting-dangling' into maintJunio C Hamano2021-10-121-1/+2
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'en/pull-conflicting-options' into maintJunio C Hamano2021-10-123-9/+54
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'po/git-config-doc-mentions-help-c' into maintJunio C Hamano2021-10-121-0/+3
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ma/doc-git-version' into maintJunio C Hamano2021-10-122-0/+32
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bs/doc-bugreport-outdir' into maintJunio C Hamano2021-10-121-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'es/walken-tutorial-fix' into maintJunio C Hamano2021-10-121-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'en/merge-strategy-docs' into maintJunio C Hamano2021-10-124-40/+53
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ab/bundle-doc' into maintJunio C Hamano2021-10-121-30/+117
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | Twelfth batchJunio C Hamano2021-10-111-0/+7
* | | | | | | | | | | | | | | | | | Merge branch 'jk/ref-paranoia'Junio C Hamano2021-10-111-9/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | refs: turn on GIT_REF_PARANOIA by defaultJeff King2021-09-271-9/+10
* | | | | | | | | | | | | | | | | | | Merge branch 'tb/midx-write-propagate-namehash'Junio C Hamano2021-10-111-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | midx.c: respect 'pack.writeBitmapHashcache' when writing bitmapsTaylor Blau2021-09-141-0/+4
* | | | | | | | | | | | | | | | | | | | The eleventh batchJunio C Hamano2021-10-061-0/+9
* | | | | | | | | | | | | | | | | | | | Merge branch 'os/status-docfix'Junio C Hamano2021-10-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | doc: fix capitalization in "git status --porcelain=v2" descriptionOrgad Shaneh2021-09-281-1/+1
* | | | | | | | | | | | | | | | | | | | | Merge branch 'ws/refer-to-forkpoint-config-in-rebase-doc'Junio C Hamano2021-10-061-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Document `rebase.forkpoint` in rebase man pageWesley Schwengle2021-09-201-1/+2
| | |_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'gc/doc-first-contribution-reroll'Junio C Hamano2021-10-061-11/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | MyFirstContribution: Document --range-diff option when writing v2Glen Choo2021-09-221-11/+31
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'ew/midx-doc-update'Junio C Hamano2021-10-061-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | doc/technical: update note about core.multiPackIndexEric Wong2021-09-241-1/+3
| | |_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'tb/commit-graph-usage-fix'Junio C Hamano2021-10-061-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | builtin/multi-pack-index.c: disable top-level --[no-]progressTaylor Blau2021-09-221-3/+3
* | | | | | | | | | | | | | | | | | | | | | | The tenth batchJunio C Hamano2021-10-031-0/+34
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'cb/cvsserver'Junio C Hamano2021-10-031-14/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Documentation: cleanup git-cvsserverCarlo Marcelo Arenas Belón2021-09-161-8/+9
| * | | | | | | | | | | | | | | | | | | | | | git-cvsserver: use crypt correctly to compare password hashesCarlo Marcelo Arenas Belón2021-09-161-6/+4
| | |_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | The ninth batchJunio C Hamano2021-09-281-0/+5
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/reduce-malloc-in-v2-servers'Junio C Hamano2021-09-281-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |