summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | t: document 'test_must_fail ok=<signal-name>'sg/doc-test-must-fail-argsSZEDER Gábor2018-02-122-2/+22
| | |_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'sb/describe-blob'Junio C Hamano2018-02-272-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | describe: confirm that blobs actually existsb/describe-blobJeff King2018-02-122-1/+9
* | | | | | | | | | | | | | | | | | | | Merge branch 'rs/check-ignore-multi'Junio C Hamano2018-02-272-1/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | check-ignore: fix mix of directories and other file typesrs/check-ignore-multiRené Scharfe2018-02-122-1/+22
| | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'rj/sparse-updates'Junio C Hamano2018-02-272-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/t0002-simplify'Junio C Hamano2018-02-271-43/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | t0002: simplify error checkingjk/t0002-simplifyJeff King2018-02-121-43/+10
| | |_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'js/packet-read-line-check-null'Junio C Hamano2018-02-274-3/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | always check for NULL return from packet_read_line()js/packet-read-line-check-nullJon Simons2018-02-082-0/+4
| * | | | | | | | | | | | | | | | | | | | correct error messages for NULL packet_read_line()Jeff King2018-02-082-3/+3
| | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'js/fix-merge-arg-quoting-in-rebase-p'Junio C Hamano2018-02-272-2/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | rebase -p: fix incorrect commit message when calling `git merge`.js/fix-merge-arg-quoting-in-rebase-pGregory Herrero2018-02-082-2/+26
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/gettext-poison'Junio C Hamano2018-02-272-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 'jk/doc-do-not-write-extern'Junio C Hamano2018-02-271-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | CodingGuidelines: mention "static" and "extern"jk/doc-do-not-write-externJeff King2018-02-081-0/+5
| | |_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'bp/name-hash-dirname-fix'Junio C Hamano2018-02-272-4/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | name-hash: properly fold directory names in adjust_dirname_case()bp/name-hash-dirname-fixBen Peart2018-02-082-4/+18
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/blame-missing-path'Junio C Hamano2018-02-271-6/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | blame: tighten command line parserjc/blame-missing-pathJunio C Hamano2018-02-071-6/+14
| | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'ab/untracked-cache-invalidation-docs'Junio C Hamano2018-02-271-0/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | update-index doc: note the caveat with "could not open..."ab/untracked-cache-invalidation-docsÆvar Arnfjörð Bjarmason2018-02-091-0/+10
| * | | | | | | | | | | | | | | | | | | | | update-index doc: note a fixed bug in the untracked cacheÆvar Arnfjörð Bjarmason2018-02-091-0/+16
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/fix-untracked-cache-invalidation'Junio C Hamano2018-02-277-18/+157
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | dir.c: ignore paths containing .git when invalidating untracked cachend/fix-untracked-cache-invalidationNguyễn Thái Ngọc Duy2018-02-076-8/+49
| * | | | | | | | | | | | | | | | | | | | | dir.c: stop ignoring opendir() error in open_cached_dir()Nguyễn Thái Ngọc Duy2018-02-021-1/+6
| * | | | | | | | | | | | | | | | | | | | | dir.c: fix missing dir invalidation in untracked codeNguyễn Thái Ngọc Duy2018-01-242-10/+16
| * | | | | | | | | | | | | | | | | | | | | dir.c: avoid stat() in valid_cached_dir()Nguyễn Thái Ngọc Duy2018-01-241-1/+1
| * | | | | | | | | | | | | | | | | | | | | status: add a failing test showing a core.untrackedCache bugÆvar Arnfjörð Bjarmason2018-01-241-0/+87
* | | | | | | | | | | | | | | | | | | | | | Fourth batch for 2.17Junio C Hamano2018-02-211-0/+12
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'sg/test-i18ngrep'Junio C Hamano2018-02-218-43/+72
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | t: make 'test_i18ngrep' more informative on failuresg/test-i18ngrepSZEDER Gábor2018-02-081-4/+20
| * | | | | | | | | | | | | | | | | | | | | | t: validate 'test_i18ngrep's parametersSZEDER Gábor2018-02-081-0/+12
| * | | | | | | | | | | | | | | | | | | | | | t: move 'test_i18ncmp' and 'test_i18ngrep' to 'test-lib-functions.sh'SZEDER Gábor2018-02-082-26/+26
| * | | | | | | | | | | | | | | | | | | | | | t5536: let 'test_i18ngrep' read the file without redirectionSZEDER Gábor2018-02-081-1/+1
| * | | | | | | | | | | | | | | | | | | | | | t5510: consolidate 'grep' and 'test_i18ngrep' patternsSZEDER Gábor2018-02-081-6/+3
| * | | | | | | | | | | | | | | | | | | | | | t4001: don't run 'git status' upstream of a pipeSZEDER Gábor2018-02-081-3/+8
| * | | | | | | | | | | | | | | | | | | | | | t6022: don't run 'git merge' upstream of a pipeSZEDER Gábor2018-02-081-2/+4
| * | | | | | | | | | | | | | | | | | | | | | t5812: add 'test_i18ngrep's missing filename parameterSZEDER Gábor2018-02-081-4/+1
| * | | | | | | | | | | | | | | | | | | | | | t5541: add 'test_i18ngrep's missing filename parameterSZEDER Gábor2018-02-081-1/+1
| | |_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'gs/rebase-allow-empty-message'Junio C Hamano2018-02-217-11/+53
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | rebase: add --allow-empty-message optiongs/rebase-allow-empty-messageGenki Sky2018-02-077-11/+53
| | |_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'lw/daemon-log-destination'Junio C Hamano2018-02-212-10/+64
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | daemon: add --log-destination=(stderr|syslog|none)lw/daemon-log-destinationLucas Werkmeister2018-02-052-10/+64
| | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/format-patch-stat-width'Junio C Hamano2018-02-212-16/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | format-patch: reduce patch diffstat width to 72nd/format-patch-stat-widthNguyễn Thái Ngọc Duy2018-02-022-15/+33