Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/reflog-walk-maint' into jk/reflog-walk | Junio C Hamano | 2017-07-07 | 3 | -12/+42 |
|\ | |||||
| * | reflog-walk: include all fields when freeing complete_reflogsjk/reflog-walk-maint | Jeff King | 2017-07-07 | 1 | -8/+18 |
| * | reflog-walk: don't free reflogs added to cache | Jeff King | 2017-07-07 | 2 | -4/+4 |
| * | reflog-walk: duplicate strings in complete_reflogs list | Jeff King | 2017-07-07 | 2 | -0/+7 |
| * | reflog-walk: skip over double-null oid due to HEAD rename | Jeff King | 2017-07-05 | 2 | -0/+13 |
* | | Fifteenth batch for 2.14 | Junio C Hamano | 2017-07-06 | 1 | -0/+24 |
* | | Merge branch 'ab/strbuf-addftime-tzname-boolify' | Junio C Hamano | 2017-07-06 | 3 | -6/+6 |
|\ \ | |||||
| * | | strbuf: change an always NULL/"" strbuf_addftime() param to boolab/strbuf-addftime-tzname-boolify | Ævar Arnfjörð Bjarmason | 2017-07-01 | 3 | -6/+6 |
| * | | strbuf.h comment: discuss strbuf_addftime() arguments in order | Ævar Arnfjörð Bjarmason | 2017-06-24 | 1 | -1/+1 |
* | | | Merge branch 'xz/send-email-batch-size' | Junio C Hamano | 2017-07-06 | 4 | -0/+45 |
|\ \ \ | |||||
| * | | | send-email: --batch-size to work around some SMTP server limit | xiaoqiang zhao | 2017-07-05 | 4 | -0/+45 |
* | | | | Merge branch 'js/t5534-rev-parse-gives-multi-line-output-fix' | Junio C Hamano | 2017-07-06 | 1 | -4/+10 |
|\ \ \ \ | |||||
| * | | | | t5534: fix misleading grep invocationjs/t5534-rev-parse-gives-multi-line-output-fix | Johannes Schindelin | 2017-07-05 | 1 | -4/+10 |
* | | | | | Merge branch 'sb/merge-recursive-code-cleanup' | Junio C Hamano | 2017-07-06 | 1 | -3/+3 |
|\ \ \ \ \ | |||||
| * | | | | | merge-recursive: use DIFF_XDL_SET macrosb/merge-recursive-code-cleanup | Stefan Beller | 2017-06-30 | 1 | -3/+3 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'rs/apply-avoid-over-reading' | Junio C Hamano | 2017-07-06 | 1 | -2/+1 |
|\ \ \ \ \ | |||||
| * | | | | | apply: use starts_with() in gitdiff_verify_name() | René Scharfe | 2017-07-01 | 1 | -2/+1 |
* | | | | | | Merge branch 'ab/sha1dc-maint' | Junio C Hamano | 2017-07-06 | 1 | -22/+66 |
|\ \ \ \ \ \ | |||||
| * | | | | | | sha1dc: update from upstreamab/sha1dc-maint | Ævar Arnfjörð Bjarmason | 2017-07-03 | 1 | -22/+66 |
* | | | | | | | Merge branch 'jc/utf8-fprintf' | Junio C Hamano | 2017-07-06 | 1 | -3/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | submodule--helper: do not call utf8_fprintf() unnecessarilyjc/utf8-fprintf | Junio C Hamano | 2017-06-28 | 1 | -3/+2 |
* | | | | | | | | Merge branch 'js/fsck-name-object' | Junio C Hamano | 2017-07-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t1450: use egrep for regexp "alternation"js/fsck-name-object | Junio C Hamano | 2017-06-28 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'aw/contrib-subtree-doc-asciidoctor' | Junio C Hamano | 2017-07-06 | 1 | -7/+19 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | subtree: honour USE_ASCIIDOCTOR when setaw/contrib-subtree-doc-asciidoctor | A. Wilcox | 2017-06-27 | 1 | -7/+19 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Fourteenth batch for 2.14 | Junio C Hamano | 2017-07-05 | 1 | -0/+12 |
* | | | | | | | | | Merge branch 'jt/unify-object-info' | Junio C Hamano | 2017-07-05 | 5 | -217/+224 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | sha1_file: refactor has_sha1_file_with_flagsjt/unify-object-info | Jonathan Tan | 2017-06-26 | 4 | -23/+13 |
| * | | | | | | | | | sha1_file: do not access pack if unneeded | Jonathan Tan | 2017-06-26 | 1 | -0/+11 |
| * | | | | | | | | | sha1_file: teach sha1_object_info_extended more flags | Jonathan Tan | 2017-06-26 | 2 | -19/+28 |
| * | | | | | | | | | sha1_file: refactor read_object | Jonathan Tan | 2017-06-21 | 2 | -42/+43 |
| * | | | | | | | | | sha1_file: move delta base cache code up | Jonathan Tan | 2017-06-21 | 1 | -110/+110 |
| * | | | | | | | | | sha1_file: rename LOOKUP_REPLACE_OBJECT | Jonathan Tan | 2017-06-21 | 3 | -18/+18 |
| * | | | | | | | | | sha1_file: rename LOOKUP_UNKNOWN_OBJECT | Jonathan Tan | 2017-06-21 | 3 | -4/+5 |
| * | | | | | | | | | sha1_file: teach packed_object_info about typename | Jonathan Tan | 2017-06-15 | 1 | -17/+12 |
* | | | | | | | | | | Merge branch 'cc/shared-index-permfix' | Junio C Hamano | 2017-07-05 | 4 | -11/+50 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | t1700: make sure split-index respects core.sharedrepositorycc/shared-index-permfix | Christian Couder | 2017-06-25 | 1 | -0/+30 |
| * | | | | | | | | | | t1301: move modebits() to test-lib-functions.sh | Christian Couder | 2017-06-25 | 2 | -11/+12 |
| * | | | | | | | | | | read-cache: use shared perms when writing shared index | Christian Couder | 2017-06-25 | 1 | -0/+8 |
* | | | | | | | | | | | Merge branch 'rs/sha1-name-readdir-optim' | Junio C Hamano | 2017-07-05 | 7 | -39/+90 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | sha1_file: guard against invalid loose subdirectory numbersrs/sha1-name-readdir-optim | René Scharfe | 2017-06-24 | 5 | -6/+9 |
| * | | | | | | | | | | | sha1_file: let for_each_file_in_obj_subdir() handle subdir names | René Scharfe | 2017-06-24 | 2 | -9/+14 |
| * | | | | | | | | | | | p4205: add perf test script for pretty log formats | René Scharfe | 2017-06-24 | 1 | -0/+16 |
| * | | | | | | | | | | | sha1_name: cache readdir(3) results in find_short_object_filename() | René Scharfe | 2017-06-22 | 3 | -26/+53 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch 'bw/repo-object' | Junio C Hamano | 2017-07-05 | 20 | -373/+972 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | ls-files: use repository objectbw/repo-object | Brandon Williams | 2017-06-23 | 3 | -115/+118 |
| * | | | | | | | | | | | repository: enable initialization of submodules | Brandon Williams | 2017-06-23 | 2 | -0/+64 |
| * | | | | | | | | | | | submodule: convert is_submodule_initialized to work on a repository | Brandon Williams | 2017-06-23 | 4 | -18/+16 |
| * | | | | | | | | | | | submodule: add repo_read_gitmodules | Brandon Williams | 2017-06-23 | 2 | -0/+17 |
| * | | | | | | | | | | | submodule-config: store the_submodule_cache in the_repository | Brandon Williams | 2017-06-23 | 4 | -18/+72 |