Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/ewah-bounds-check' | Junio C Hamano | 2018-06-18 | 1 | -1/+2 |
|\ | |||||
| * | ewah: adjust callers of ewah_read_mmap() | Jeff King | 2018-06-18 | 1 | -1/+2 |
* | | Merge branch 'bc/object-id' | Junio C Hamano | 2018-05-30 | 1 | -12/+13 |
|\ \ | |||||
| * | | dir: use the_hash_algo for empty blob object ID | brian m. carlson | 2018-05-02 | 1 | -1/+1 |
| * | | dir: convert struct untracked_cache_dir to object_id | brian m. carlson | 2018-05-02 | 1 | -11/+12 |
* | | | Sync with Git 2.17.1 | Junio C Hamano | 2018-05-29 | 1 | -1/+1 |
|\ \ \ | |||||
| * \ \ | Sync with Git 2.16.4 | Junio C Hamano | 2018-05-22 | 1 | -1/+1 |
| |\ \ \ | | | |/ | | |/| | |||||
* | | | | Merge branch 'sb/submodule-move-nested' | Junio C Hamano | 2018-05-08 | 1 | -3/+57 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | submodule: fixup nested submodules after moving the submodulesb/submodule-move-nested | Stefan Beller | 2018-03-29 | 1 | -3/+57 |
* | | | | sha1_file: convert read_sha1_file to struct object_id | brian m. carlson | 2018-03-14 | 1 | -1/+1 |
| |/ / |/| | | |||||
* | | | Merge branch 'bp/untracked-cache-noflush' | Junio C Hamano | 2018-03-08 | 1 | -2/+13 |
|\ \ \ | |||||
| * | | | untracked cache: use git_env_bool() not getenv() for customizationbp/untracked-cache-noflush | Junio C Hamano | 2018-02-28 | 1 | -2/+12 |
| * | | | dir.c: don't flag the index as dirty for changes to the untracked cache | Ben Peart | 2018-02-05 | 1 | -1/+2 |
| | |/ | |/| | |||||
* | | | Merge branch 'nd/fix-untracked-cache-invalidation' | Junio C Hamano | 2018-02-27 | 1 | -14/+27 |
|\ \ \ | |||||
| * | | | dir.c: ignore paths containing .git when invalidating untracked cachend/fix-untracked-cache-invalidation | Nguyễn Thái Ngọc Duy | 2018-02-07 | 1 | -4/+6 |
| * | | | dir.c: stop ignoring opendir() error in open_cached_dir() | Nguyễn Thái Ngọc Duy | 2018-02-02 | 1 | -1/+6 |
| * | | | dir.c: fix missing dir invalidation in untracked code | Nguyễn Thái Ngọc Duy | 2018-01-24 | 1 | -8/+14 |
| * | | | dir.c: avoid stat() in valid_cached_dir() | Nguyễn Thái Ngọc Duy | 2018-01-24 | 1 | -1/+1 |
* | | | | Merge branch 'nd/trace-index-ops' | Junio C Hamano | 2018-02-15 | 1 | -0/+2 |
|\ \ \ \ | |||||
| * | | | | trace: measure where the time is spent in the index-heavy operationsnd/trace-index-ops | Nguyễn Thái Ngọc Duy | 2018-02-02 | 1 | -0/+2 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'po/object-id' | Junio C Hamano | 2018-02-15 | 1 | -54/+50 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | sha1_file: convert hash_sha1_file to object_id | Patryk Obara | 2018-01-30 | 1 | -2/+2 |
| * | | | dir: convert struct sha1_stat to use object_id | Patryk Obara | 2018-01-30 | 1 | -54/+50 |
| |/ / | |||||
* | | | Use MOVE_ARRAYsg/cocci-move-array | SZEDER Gábor | 2018-01-22 | 1 | -2/+2 |
|/ / | |||||
* | | Merge branch 'jh/object-filtering' | Junio C Hamano | 2017-12-27 | 1 | -31/+101 |
|\ \ | |/ |/| | |||||
| * | dir: allow exclusions from blob in addition to file | Jeff Hostetler | 2017-11-22 | 1 | -31/+101 |
* | | Merge branch 'bp/fsmonitor' | Junio C Hamano | 2017-11-21 | 1 | -10/+17 |
|\ \ | |||||
| * | | fsmonitor: teach git to optionally utilize a file system monitor to speed up ... | Ben Peart | 2017-10-01 | 1 | -10/+17 |
| * | | Merge branch 'rs/stat-data-unaligned-reads-fix' | Junio C Hamano | 2017-08-11 | 1 | -23/+27 |
| |\ \ | |||||
* | \ \ | Merge branch 'jm/status-ignored-files-list' | Junio C Hamano | 2017-11-13 | 1 | -2/+42 |
|\ \ \ \ | |||||
| * | | | | status: report matching ignored and normal untracked | Jameson Miller | 2017-10-31 | 1 | -2/+18 |
| * | | | | status: add option to show ignored files differently | Jameson Miller | 2017-10-31 | 1 | -0/+24 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'bc/object-id' | Junio C Hamano | 2017-11-06 | 1 | -4/+4 |
|\ \ \ \ | |||||
| * | | | | refs: convert resolve_gitlink_ref to struct object_id | brian m. carlson | 2017-10-16 | 1 | -2/+2 |
| * | | | | Convert remaining callers of resolve_gitlink_ref to object_id | brian m. carlson | 2017-10-16 | 1 | -4/+4 |
| |/ / / | |||||
* | | | | Merge branch 'js/submodule-in-excluded' | Junio C Hamano | 2017-11-06 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | status: do not get confused by submodules in excluded directoriesjs/submodule-in-excluded | Johannes Schindelin | 2017-10-26 | 1 | -1/+1 |
| * | | | Merge branch 'sl/clean-d-ignored-fix' into maint | Junio C Hamano | 2017-06-13 | 1 | -4/+39 |
| |\ \ \ | |||||
* | | | | | Improve performance of git status --ignoredjm/status-ignored-directory-optim | Jameson Miller | 2017-09-19 | 1 | -6/+41 |
* | | | | | Merge branch 'rs/stat-data-unaligned-reads-fix' into maint | Junio C Hamano | 2017-08-23 | 1 | -23/+27 |
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| | | |||||
| * | | | dir: support platforms that require aligned readsrs/stat-data-unaligned-reads-fix | René Scharfe | 2017-07-17 | 1 | -23/+27 |
* | | | | Merge branch 'ab/wildmatch' | Junio C Hamano | 2017-07-10 | 1 | -5/+3 |
|\ \ \ \ | |||||
| * | | | | wildmatch: remove unused wildopts parameterab/wildmatch | Ævar Arnfjörð Bjarmason | 2017-06-23 | 1 | -5/+3 |
* | | | | | Merge branch 'ab/free-and-null' | Junio C Hamano | 2017-06-24 | 1 | -6/+3 |
|\ \ \ \ \ | |||||
| * | | | | | coccinelle: make use of the "type" FREE_AND_NULL() rule | Ævar Arnfjörð Bjarmason | 2017-06-16 | 1 | -6/+3 |
* | | | | | | Merge branch 'bw/config-h' | Junio C Hamano | 2017-06-24 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | config: don't include config.h by default | Brandon Williams | 2017-06-15 | 1 | -0/+1 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'bw/ls-files-sans-the-index' | Junio C Hamano | 2017-06-24 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | convert: convert convert_to_git to take an index | Brandon Williams | 2017-06-13 | 1 | -1/+1 |
* | | | | | | Merge branch 'pc/dir-count-slashes' | Junio C Hamano | 2017-06-22 | 1 | -0/+9 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | |