summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Git 2.16.4v2.16.4Junio C Hamano2018-05-223-2/+7
* Sync with Git 2.15.2Junio C Hamano2018-05-2218-41/+500
|\
| * Git 2.15.2v2.15.2Junio C Hamano2018-05-222-1/+4
| * Sync with Git 2.14.4Junio C Hamano2018-05-2217-41/+497
| |\
| | * Git 2.14.4v2.14.4Junio C Hamano2018-05-223-2/+7
| | * Sync with Git 2.13.7Junio C Hamano2018-05-2216-41/+492
| | |\
| | | * Git 2.13.7v2.13.7Junio C Hamano2018-05-223-2/+22
| | | * Merge branch 'jk/submodule-fix-loose' into maint-2.13Junio C Hamano2018-05-2215-41/+472
| | | |\
| | | | * verify_path: disallow symlinks in .gitmodulesJeff King2018-05-214-15/+37
| | | | * update-index: stat updated files earlierJeff King2018-05-211-8/+17
| | | | * verify_dotfile: mention case-insensitivity in commentJeff King2018-05-211-1/+4
| | | | * verify_path: drop clever fallthroughJeff King2018-05-211-4/+4
| | | | * skip_prefix: add case-insensitive variantJeff King2018-05-211-0/+17
| | | | * is_{hfs,ntfs}_dotgitmodules: add testsJohannes Schindelin2018-05-212-0/+106
| | | | * is_ntfs_dotgit: match other .git filesJohannes Schindelin2018-05-212-1/+93
| | | | * is_hfs_dotgit: match other .git filesJeff King2018-05-212-12/+51
| | | | * is_ntfs_dotgit: use a size_t for traversing stringJeff King2018-05-211-1/+1
| | | | * submodule-config: verify submodule names as pathsJeff King2018-05-215-0/+143
| | | |/
* | | | Git 2.16.3v2.16.3snapJunio C Hamano2018-03-223-2/+51
* | | | Merge branch 'ms/non-ascii-ticks' into maintJunio C Hamano2018-03-221-7/+7
|\ \ \ \
| * | | | Documentation/gitsubmodules.txt: avoid non-ASCII apostrophesms/non-ascii-ticksMotoki Seki2018-02-221-7/+7
* | | | | Merge branch 'jk/cached-commit-buffer' into maintJunio C Hamano2018-03-225-46/+1
|\ \ \ \ \
| * | | | | revision: drop --show-all optionjk/cached-commit-bufferJeff King2018-02-223-42/+0
| * | | | | commit: drop uses of get_cached_commit_buffer()Jeff King2018-02-222-4/+1
| |/ / / /
* | | | | Merge branch 'sm/mv-dry-run-update' into maintJunio C Hamano2018-03-222-2/+7
|\ \ \ \ \
| * | | | | mv: remove unneeded 'if (!show_only)'sm/mv-dry-run-updateStefan Moch2018-02-071-2/+1
| * | | | | t7001: add test case for --dry-runStefan Moch2018-02-071-0/+6
| | |_|/ / | |/| | |
* | | | | Merge branch 'tg/worktree-create-tracking' into maintJunio C Hamano2018-03-221-2/+3
|\ \ \ \ \
| * | | | | git-worktree.txt: fix indentation of example and text of 'add' commandtg/worktree-create-trackingEric Sunshine2018-02-161-0/+1
| * | | | | git-worktree.txt: fix missing ")" typoEric Sunshine2018-02-161-2/+2
* | | | | | Merge branch 'gs/test-unset-xdg-cache-home' into maintJunio C Hamano2018-03-221-0/+1
|\ \ \ \ \ \
| * | | | | | test-lib.sh: unset XDG_CACHE_HOMEgs/test-unset-xdg-cache-homeGenki Sky2018-02-161-0/+1
* | | | | | | Merge branch 'sb/status-doc-fix' into maintJunio C Hamano2018-03-221-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Documentation/git-status: clarify status table for porcelain modesb/status-doc-fixStefan Beller2018-02-151-2/+2
* | | | | | | | Merge branch 'rd/typofix' into maintJunio C Hamano2018-03-225-6/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Correct mispellings of ".gitmodule" to ".gitmodules"rd/typofixRobert P. J. Day2018-02-144-5/+5
| * | | | | | | | t/: correct obvious typo "detahced"Robert P. J. Day2018-02-141-1/+1
* | | | | | | | | Merge branch 'bp/fsmonitor' into maintJunio C Hamano2018-03-221-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fsmonitor: update documentation to remove reference to invalid config settingsbp/fsmonitorBen Peart2018-02-141-2/+2
* | | | | | | | | | Merge branch 'bc/doc-interpret-trailers-grammofix' into maintJunio C Hamano2018-03-221-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | docs/interpret-trailers: fix agreement errorbc/doc-interpret-trailers-grammofixbrian m. carlson2018-02-131-1/+1
* | | | | | | | | | | Merge branch 'sg/doc-test-must-fail-args' into maintJunio C Hamano2018-03-222-2/+22
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t: document 'test_must_fail ok=<signal-name>'sg/doc-test-must-fail-argsSZEDER Gábor2018-02-122-2/+22
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'rj/sparse-updates' into maintJunio C Hamano2018-03-222-1/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Makefile: suppress a sparse warning for pack-revindex.crj/sparse-updatesRamsay Jones2018-02-121-0/+2
| * | | | | | | | | | | config.mak.uname: remove SPARSE_FLAGS setting for cygwinRamsay Jones2018-02-121-1/+0
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jk/gettext-poison' into maintJunio C Hamano2018-03-222-8/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-sh-i18n: check GETTEXT_POISON before USE_GETTEXT_SCHEMEjk/gettext-poisonJeff King2018-02-081-4/+4
| * | | | | | | | | | | t0205: drop redundant testJeff King2018-02-081-4/+0
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'nd/ignore-glob-doc-update' into maintJunio C Hamano2018-03-221-6/+5
|\ \ \ \ \ \ \ \ \ \ \