summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-rm-absorb'Junio C Hamano2017-06-191-4/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation/git-rm: correct submodule descriptionsb/submodule-rm-absorbStefan Beller2017-06-041-4/+5
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ab/pcre-v2'Junio C Hamano2017-06-1910-29/+349
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | grep: add support for PCRE v2Ævar Arnfjörð Bjarmason2017-06-025-21/+256
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | grep: un-break building with PCRE >= 8.32 without --enable-jitÆvar Arnfjörð Bjarmason2017-06-023-0/+16
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | grep: un-break building with PCRE < 8.20Ævar Arnfjörð Bjarmason2017-05-261-0/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | grep: un-break building with PCRE < 8.32Ævar Arnfjörð Bjarmason2017-05-262-3/+8
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | grep: add support for the PCRE v1 JIT APIÆvar Arnfjörð Bjarmason2017-05-262-4/+42
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | log: add -P as a synonym for --perl-regexpÆvar Arnfjörð Bjarmason2017-05-263-1/+14
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | grep: skip pthreads overhead when using one threadÆvar Arnfjörð Bjarmason2017-05-261-0/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | grep: don't redundantly compile throwaway patterns under threadingÆvar Arnfjörð Bjarmason2017-05-261-3/+11
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/pathspec-magic-disambiguation'Junio C Hamano2017-06-192-10/+64
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | verify_filename(): flip order of checksjk/pathspec-magic-disambiguationJeff King2017-05-291-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | verify_filename(): treat ":(magic)" as a pathspecJeff King2017-05-292-1/+32
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | check_filename(): handle ":^" path magicJeff King2017-05-292-0/+17
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | check_filename(): use skip_prefixJeff King2017-05-291-3/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | check_filename(): refactor ":/" handlingJeff King2017-05-291-7/+8
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t4208: add check for ":/" without matching fileJeff King2017-05-291-0/+6
| | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-process: correct path to API docs in a commentChristian Couder2017-06-151-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'svn-doc' of git://bogomips.org/git-svnJunio C Hamano2017-06-151-0/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-svn: document special options for commit-diffAndreas Heiduk2017-06-151-0/+15
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sync with maintJunio C Hamano2017-06-131-0/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Prepare for 2.13.2cc/subprocess-comment-fixJunio C Hamano2017-06-132-1/+38
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ad/pull-remote-doc' into maintJunio C Hamano2017-06-131-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/drop-free-refspecs' into maintJunio C Hamano2017-06-131-22/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/connect-symref-info-leak-fix' into maintJunio C Hamano2017-06-131-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rf/completion-config-commit' into maintJunio C Hamano2017-06-131-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ab/t3070-test-dedup' into maintJunio C Hamano2017-06-131-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jh/memihash-opt' into maintJunio C Hamano2017-06-131-5/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tb/pull-ff-rebase-autostash' into maintJunio C Hamano2017-06-132-11/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jh/close-index-before-stat' into maintJunio C Hamano2017-06-131-4/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sl/clean-d-ignored-fix' into maintJunio C Hamano2017-06-136-5/+109
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dk/send-email-avoid-net-smtp-ssl-when-able' into maintJunio C Hamano2017-06-131-19/+35
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/skip-test-in-the-middle' into maintJunio C Hamano2017-06-132-50/+56
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bw/forking-and-threading' into maintJunio C Hamano2017-06-139-134/+449
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/bug-to-abort' into maintJunio C Hamano2017-06-135-1/+51
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/checkout-recurse-submodules' into maintJunio C Hamano2017-06-134-18/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eighth batch for 2.14Junio C Hamano2017-06-131-14/+21
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/pack-idx-corruption-safety'Junio C Hamano2017-06-131-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5313: make extended-table test more deterministicjk/pack-idx-corruption-safetyJeff King2017-06-071-1/+7
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/fopen-errors'Junio C Hamano2017-06-1332-92/+125
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mingw_fopen: report ENOENT for invalid file namesJohannes Sixt2017-06-022-1/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mingw: verify that paths are not mistaken for remote nicknamesJohannes Schindelin2017-06-021-2/+8
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | log: fix memory leak in open_next_file()Nguyễn Thái Ngọc Duy2017-05-261-4/+8
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rerere.c: move error_errno() closer to the source system callNguyễn Thái Ngọc Duy2017-05-261-1/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | print errno when reporting a system call errorNguyễn Thái Ngọc Duy2017-05-263-5/+6
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wrapper.c: make warn_on_inaccessible() staticNguyễn Thái Ngọc Duy2017-05-262-7/+5
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wrapper.c: add and use fopen_or_warn()Nguyễn Thái Ngọc Duy2017-05-2615-26/+43
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wrapper.c: add and use warn_on_fopen_errors()Nguyễn Thái Ngọc Duy2017-05-265-4/+20
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | config.mak.uname: set FREAD_READS_DIRECTORIES for Darwin, tooJunio C Hamano2017-05-261-0/+1