summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Git 2.25.1v2.25.1Junio C Hamano2020-02-163-2/+57
* Merge branch 'js/convert-typofix' into maintJunio C Hamano2020-02-141-1/+1
|\
| * convert: fix typoJohannes Schindelin2020-02-111-1/+1
* | Merge branch 'js/ci-squelch-doc-warning' into maintJunio C Hamano2020-02-141-0/+1
|\ \
| * | ci: ignore rubygems warning in the "Documentation" jobJohannes Schindelin2020-02-101-0/+1
* | | Merge branch 'jb/multi-pack-index-docfix' into maintJunio C Hamano2020-02-141-2/+3
|\ \ \
| * | | pack-format: correct multi-pack-index descriptionJohannes Berg2020-02-101-2/+3
* | | | Merge branch 'ma/diff-doc-clarify-regexp-example' into maintJunio C Hamano2020-02-141-4/+4
|\ \ \ \
| * | | | diff-options.txt: avoid "regex" overload in exampleMartin Ågren2020-02-091-4/+4
| |/ / /
* | | | Merge branch 'ms/doc-bundle-format' into maintJunio C Hamano2020-02-141-0/+48
|\ \ \ \
| * | | | doc: describe Git bundle formatMasaya Suzuki2020-02-071-0/+48
| | |_|/ | |/| |
* | | | Merge branch 'es/submodule-fetch-message-fix' into maintJunio C Hamano2020-02-141-1/+1
|\ \ \ \
| * | | | submodule: add newline on invalid submodule errorEmily Shaffer2020-02-071-1/+1
| |/ / /
* | | | Merge branch 'jb/parse-options-message-fix' into maintJunio C Hamano2020-02-142-4/+4
|\ \ \ \
| * | | | parse-options: lose an unnecessary space in an error messageJacques Bodin-Hullin2020-02-052-4/+4
| | |_|/ | |/| |
* | | | Merge branch 'ma/filter-branch-doc-caret' into maintJunio C Hamano2020-02-141-3/+3
|\ \ \ \
| * | | | git-filter-branch.txt: wrap "maths" notation in backticksMartin Ågren2020-02-041-3/+3
* | | | | Merge branch 'km/submodule-doc-use-sm-path' into maintJunio C Hamano2020-02-141-1/+1
|\ \ \ \ \
| * | | | | submodule foreach: replace $path with $sm_path in exampleKyle Meyer2020-01-311-1/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'pb/do-not-recurse-grep-no-index' into maintJunio C Hamano2020-02-143-4/+17
|\ \ \ \ \
| * | | | | grep: ignore --recurse-submodules if --no-index is givenPhilippe Blain2020-01-303-4/+17
* | | | | | Merge branch 'jt/t5616-robustify' into maintJunio C Hamano2020-02-141-13/+23
|\ \ \ \ \ \
| * | | | | | t5616: make robust to delta base changeJonathan Tan2020-01-271-13/+23
| |/ / / / /
* | | | | | Merge branch 'en/fill-directory-fixes-more' into maintJunio C Hamano2020-02-142-45/+47
|\ \ \ \ \ \
| * | | | | | dir: point treat_leading_path() warning to the right placeJeff King2020-01-161-3/+3
| * | | | | | dir: restructure in a way to avoid passing around a struct direntJeff King2020-01-161-42/+31
| * | | | | | dir: treat_leading_path() and read_directory_recursive(), round 2Elijah Newren2020-01-162-1/+5
| * | | | | | clean: demonstrate a bug with pathspecsDerrick Stolee2020-01-161-0/+9
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'bc/misconception-doc' into maintJunio C Hamano2020-02-142-0/+24
|\ \ \ \ \ \
| * | | | | | docs: mention when increasing http.postBuffer is valuablebrian m. carlson2020-01-221-0/+8
| * | | | | | doc: dissuade users from trying to ignore tracked filesbrian m. carlson2020-01-221-0/+16
* | | | | | | Merge branch 'bc/author-committer-doc' into maintJunio C Hamano2020-02-144-27/+69
|\ \ \ \ \ \ \
| * | | | | | | doc: provide guidance on user.name formatbrian m. carlson2020-01-222-1/+12
| * | | | | | | docs: expand on possible and recommended user config optionsbrian m. carlson2020-01-221-0/+7
| * | | | | | | doc: move author and committer information to git-commit(1)brian m. carlson2020-01-224-27/+51
| |/ / / / / /
* | | | | | | Merge branch 'ds/refmap-doc' into maintJunio C Hamano2020-02-142-1/+28
|\ \ \ \ \ \ \
| * | | | | | | fetch: document and test --refmap=""Derrick Stolee2020-01-212-1/+28
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'bc/actualmente' into maintJunio C Hamano2020-02-141-2/+2
|\ \ \ \ \ \ \
| * | | | | | | docs: use "currently" for the present timebrian m. carlson2020-01-211-2/+2
* | | | | | | | Merge branch 'rt/submodule-i18n' into maintJunio C Hamano2020-02-141-14/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | submodule.c: mark more strings for translationRalf Thielow2020-01-161-14/+14
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/test-fixes' into maintJunio C Hamano2020-02-142-4/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | t7800: don't rely on reuse_worktree_file()Jeff King2020-01-161-3/+2
| * | | | | | | | t4018: drop "debugging" cat from hunk-header testsJeff King2020-01-161-1/+0
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/asan-build-fix' into maintJunio C Hamano2020-02-142-0/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Makefile: use compat regex with SANITIZE=addressJeff King2020-01-162-0/+8
| |/ / / / / / /
* | | | | | | | Merge branch 'ds/sparse-cone' into maintJunio C Hamano2020-02-142-2/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | .mailmap: fix GGG authoship screwupJunio C Hamano2020-01-271-0/+1
| * | | | | | | | unpack-trees: correctly compute result countDerrick Stolee via GitGitGadget2020-01-101-2/+2
* | | | | | | | | Merge branch 'nd/switch-and-restore' into maintJunio C Hamano2020-02-142-0/+19
|\ \ \ \ \ \ \ \ \