summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* pull: optionally rebase submodules (remote submodule changes only)Stefan Beller2017-06-231-0/+58
* Merge branch 'rs/strbuf-addftime-zZ'Junio C Hamano2017-06-221-2/+14
|\
| * date: use localtime() for "-local" time formatsrs/strbuf-addftime-zZJeff King2017-06-151-0/+1
| * t0006: check --date=format zone offsetsJeff King2017-06-151-2/+7
| * strbuf: let strbuf_addftime handle %z and %Z itselfRené Scharfe2017-06-151-0/+6
* | Merge branch 'sd/t3200-branch-m-test'Junio C Hamano2017-06-221-0/+17
|\ \
| * | t3200: add test for single parameter passed to -m optionsd/t3200-branch-m-testSahil Dua2017-06-131-0/+17
| * | Merge branch 'sd/t3200-typofix' into maintJunio C Hamano2017-06-051-1/+1
| |\ \
| * \ \ Merge branch 'sb/t5531-update-desc' into maintJunio C Hamano2017-06-051-2/+2
| |\ \ \
| * \ \ \ Merge branch 'tb/dedup-crlf-tests' into maintJunio C Hamano2017-06-052-187/+0
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/alternate-ref-optim' into maintJunio C Hamano2017-06-051-1/+4
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'bm/interpret-trailers-cut-line-is-eom' into maintJunio C Hamano2017-06-051-0/+17
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jn/clone-add-empty-config-from-command-line' into maintJunio C Hamano2017-06-051-0/+8
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jt/use-trailer-api-in-commands' into maintJunio C Hamano2017-06-041-0/+44
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jt/push-options-doc' into maintJunio C Hamano2017-06-041-0/+37
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'js/eol-on-ourselves' into maintJunio C Hamano2017-06-047-25/+45
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/ignore-broken-tags-when-ignoring-missing-links' into maintJunio C Hamano2017-06-041-1/+26
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/disable-pack-reuse-when-broken' into maintJunio C Hamano2017-06-041-3/+45
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bw/submodule-with-bs-path' into maintJunio C Hamano2017-06-041-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ah/log-decorate-default-to-auto' into maintJunio C Hamano2017-06-041-0/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ab/fix-poison-tests' into maintJunio C Hamano2017-06-0415-34/+38
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ab/doc-replace-gmane-links' into maintJunio C Hamano2017-06-041-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'ps/stash-push-pathspec-fix'Junio C Hamano2017-06-221-0/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | git-stash: fix pushing stash with pathspec from subdirps/stash-push-pathspec-fixPatrick Steinhardt2017-06-131-0/+16
* | | | | | | | | | | | | | | | | | Merge branch 'km/test-mailinfo-b-failure'Junio C Hamano2017-06-221-0/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | t5100: add some more mailinfo testskm/test-mailinfo-b-failureKyle J. McKay2017-06-121-0/+42
* | | | | | | | | | | | | | | | | | | Merge branch 'sb/t4005-modernize'Junio C Hamano2017-06-221-52/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | t4005: modernize style and drop hard coded sha1sb/t4005-modernizeStefan Beller2017-06-101-52/+43
| |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/consistent-h'Junio C Hamano2017-06-191-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | t0012: test "-h" with builtinsjk/consistent-hJeff King2017-06-051-0/+12
| | |_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'ab/perf-remove-index-lock'Junio C Hamano2017-06-191-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | perf: work around the tested repo having an index.lockab/perf-remove-index-lockÆvar Arnfjörð Bjarmason2017-06-051-1/+8
* | | | | | | | | | | | | | | | | | | | Merge branch 'ab/pcre-v2'Junio C Hamano2017-06-192-1/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | grep: add support for PCRE v2Ævar Arnfjörð Bjarmason2017-06-021-1/+1
| * | | | | | | | | | | | | | | | | | | | log: add -P as a synonym for --perl-regexpÆvar Arnfjörð Bjarmason2017-05-261-0/+12
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/pathspec-magic-disambiguation'Junio C Hamano2017-06-191-0/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | verify_filename(): treat ":(magic)" as a pathspecJeff King2017-05-291-0/+13
| * | | | | | | | | | | | | | | | | | | | | check_filename(): handle ":^" path magicJeff King2017-05-291-0/+13
| * | | | | | | | | | | | | | | | | | | | | t4208: add check for ":/" without matching fileJeff King2017-05-291-0/+6
| | |_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | 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-133-6/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | mingw_fopen: report ENOENT for invalid file namesJohannes Sixt2017-06-021-1/+1
| * | | | | | | | | | | | | | | | | | | | | | mingw: verify that paths are not mistaken for remote nicknamesJohannes Schindelin2017-06-021-2/+8
| * | | | | | | | | | | | | | | | | | | | | | wrapper.c: add and use fopen_or_warn()Nguyễn Thái Ngọc Duy2017-05-262-3/+12
| * | | | | | | | | | | | | | | | | | | | | | wrapper.c: add and use warn_on_fopen_errors()Nguyễn Thái Ngọc Duy2017-05-261-1/+2
| * | | | | | | | | | | | | | | | | | | | | | config.mak.uname: set FREAD_READS_DIRECTORIES for Linux and FreeBSDNguyễn Thái Ngọc Duy2017-05-261-0/+8
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-blanket-recursive'Junio C Hamano2017-06-137-10/+73
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | builtin/fetch.c: respect 'submodule.recurse' optionsb/submodule-blanket-recursiveStefan Beller2017-06-011-0/+10
| * | | | | | | | | | | | | | | | | | | | | | builtin/push.c: respect 'submodule.recurse' optionStefan Beller2017-06-011-0/+21