Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | ls-files: use repository objectbw/repo-object | Brandon Williams | 2017-06-23 | 1 | -0/+39 |
*-. | Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-ob... | Junio C Hamano | 2017-06-23 | 5 | -1/+22 |
|\ \ | |||||
| | * | config: don't include config.h by default | Brandon Williams | 2017-06-15 | 2 | -0/+2 |
| | * | alias: use the early config machinery to expand aliasesjs/alias-early-config | Johannes Schindelin | 2017-06-15 | 1 | -1/+1 |
| | * | t7006: demonstrate a problem with aliases in subdirectories | Johannes Schindelin | 2017-06-15 | 1 | -0/+11 |
| | * | t1308: relax the test verifying that empty alias values are disallowed | Johannes Schindelin | 2017-06-15 | 1 | -1/+3 |
| | * | config: report correct line number upon error | Johannes Schindelin | 2017-06-15 | 1 | -0/+6 |
* | | | Merge branch 'jk/consistent-h' | Junio C Hamano | 2017-06-19 | 1 | -0/+12 |
|\ \ \ | |||||
| * | | | t0012: test "-h" with builtinsjk/consistent-h | Jeff King | 2017-06-05 | 1 | -0/+12 |
| | |/ | |/| | |||||
* | | | Merge branch 'ab/perf-remove-index-lock' | Junio C Hamano | 2017-06-19 | 1 | -1/+8 |
|\ \ \ | |||||
| * | | | perf: work around the tested repo having an index.lockab/perf-remove-index-lock | Ævar Arnfjörð Bjarmason | 2017-06-05 | 1 | -1/+8 |
| | |/ | |/| | |||||
* | | | Merge branch 'ab/pcre-v2' | Junio C Hamano | 2017-06-19 | 2 | -1/+13 |
|\ \ \ | |||||
| * | | | grep: add support for PCRE v2 | Ævar Arnfjörð Bjarmason | 2017-06-02 | 1 | -1/+1 |
| * | | | log: add -P as a synonym for --perl-regexp | Ævar Arnfjörð Bjarmason | 2017-05-26 | 1 | -0/+12 |
* | | | | Merge branch 'jk/pathspec-magic-disambiguation' | Junio C Hamano | 2017-06-19 | 1 | -0/+32 |
|\ \ \ \ | |||||
| * | | | | verify_filename(): treat ":(magic)" as a pathspec | Jeff King | 2017-05-29 | 1 | -0/+13 |
| * | | | | check_filename(): handle ":^" path magic | Jeff King | 2017-05-29 | 1 | -0/+13 |
| * | | | | t4208: add check for ":/" without matching file | Jeff King | 2017-05-29 | 1 | -0/+6 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'jk/pack-idx-corruption-safety' | Junio C Hamano | 2017-06-13 | 1 | -1/+7 |
|\ \ \ \ | |||||
| * | | | | t5313: make extended-table test more deterministicjk/pack-idx-corruption-safety | Jeff King | 2017-06-07 | 1 | -1/+7 |
* | | | | | Merge branch 'nd/fopen-errors' | Junio C Hamano | 2017-06-13 | 3 | -6/+30 |
|\ \ \ \ \ | |||||
| * | | | | | mingw_fopen: report ENOENT for invalid file names | Johannes Sixt | 2017-06-02 | 1 | -1/+1 |
| * | | | | | mingw: verify that paths are not mistaken for remote nicknames | Johannes Schindelin | 2017-06-02 | 1 | -2/+8 |
| * | | | | | wrapper.c: add and use fopen_or_warn() | Nguyễn Thái Ngọc Duy | 2017-05-26 | 2 | -3/+12 |
| * | | | | | wrapper.c: add and use warn_on_fopen_errors() | Nguyễn Thái Ngọc Duy | 2017-05-26 | 1 | -1/+2 |
| * | | | | | config.mak.uname: set FREAD_READS_DIRECTORIES for Linux and FreeBSD | Nguyễn Thái Ngọc Duy | 2017-05-26 | 1 | -0/+8 |
* | | | | | | Merge branch 'sb/submodule-blanket-recursive' | Junio C Hamano | 2017-06-13 | 7 | -10/+73 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | builtin/fetch.c: respect 'submodule.recurse' optionsb/submodule-blanket-recursive | Stefan Beller | 2017-06-01 | 1 | -0/+10 |
| * | | | | | builtin/push.c: respect 'submodule.recurse' option | Stefan Beller | 2017-06-01 | 1 | -0/+21 |
| * | | | | | builtin/grep.c: respect 'submodule.recurse' option | Stefan Beller | 2017-06-01 | 1 | -0/+18 |
| * | | | | | Introduce 'submodule.recurse' option for worktree manipulators | Stefan Beller | 2017-06-01 | 1 | -0/+12 |
| * | | | | | submodule test invocation: only pass additional arguments | Stefan Beller | 2017-05-30 | 4 | -10/+12 |
| * | | | | | Merge branch 'ab/grep-preparatory-cleanup' into sb/submodule-blanket-recursive | Junio C Hamano | 2017-05-30 | 15 | -164/+729 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
* | | | | | | Merge branch 'tb/pull-ff-rebase-autostash' | Junio C Hamano | 2017-06-05 | 1 | -0/+18 |
|\ \ \ \ \ \ | |||||
| * | | | | | | pull: ff --rebase --autostash works in dirty repotb/pull-ff-rebase-autostash | Tyler Brazier | 2017-06-01 | 1 | -0/+18 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'mh/packed-ref-store-prep' | Junio C Hamano | 2017-06-05 | 4 | -5/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | ref_store: take a `msg` parameter when deleting references | Michael Haggerty | 2017-05-23 | 3 | -3/+4 |
| * | | | | | | t3600: clean up permissions test properly | Michael Haggerty | 2017-05-23 | 1 | -2/+2 |
| * | | | | | | Merge branch 'bc/object-id' | Junio C Hamano | 2017-05-23 | 2 | -4/+4 |
| |\ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ | Merge branch 'mb/diff-default-to-indent-heuristics' | Junio C Hamano | 2017-06-05 | 2 | -17/+170 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | diff: enable indent heuristic by default | Stefan Beller | 2017-05-09 | 2 | -28/+115 |
| * | | | | | | | | diff: have the diff-* builtins configure diff before initializing revisions | Marc Branchaud | 2017-05-09 | 1 | -0/+66 |
* | | | | | | | | | Merge branch 'ab/t3070-test-dedup' | Junio C Hamano | 2017-06-04 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | wildmatch test: remove redundant duplicate testab/t3070-test-dedup | Ævar Arnfjörð Bjarmason | 2017-05-29 | 1 | -1/+0 |
* | | | | | | | | | | Merge branch 'sd/t3200-typofix' | Junio C Hamano | 2017-06-04 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | branch test: fix invalid config key accesssd/t3200-typofix | Sahil Dua | 2017-05-29 | 1 | -1/+1 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'ab/grep-preparatory-cleanup' | Junio C Hamano | 2017-06-02 | 15 | -164/+729 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
| * | | | | | | | | | grep: given --threads with NO_PTHREADS=YesPlease, warn | Ævar Arnfjörð Bjarmason | 2017-05-26 | 1 | -0/+18 |
| * | | | | | | | | | pack-objects: fix buggy warning about threads | Ævar Arnfjörð Bjarmason | 2017-05-26 | 1 | -1/+1 |
| * | | | | | | | | | pack-objects & index-pack: add test for --threads warning | Ævar Arnfjörð Bjarmason | 2017-05-26 | 1 | -0/+36 |