Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jh/memihash-opt' | Junio C Hamano | 2017-04-19 | 4 | -0/+36 |
|\ | |||||
| * | p0004: make perf test executable | Christian Couder | 2017-04-18 | 1 | -0/+0 |
| * | t3008: skip lazy-init test on a single-core box | Kevin Willford | 2017-04-12 | 1 | -3/+11 |
| * | test-online-cpus: helper to return cpu count | Jeff Hostetler | 2017-04-12 | 2 | -0/+9 |
| * | name-hash: fix buffer overrun | Kevin Willford | 2017-03-31 | 1 | -0/+19 |
* | | Merge branch 'sf/putty-w-args' | Junio C Hamano | 2017-04-19 | 1 | -0/+6 |
|\ \ | |||||
| * | | connect.c: handle errors from split_cmdline | Jeff King | 2017-04-16 | 1 | -0/+6 |
* | | | Merge branch 'ld/p4-current-branch-fix' | Junio C Hamano | 2017-04-19 | 1 | -0/+16 |
|\ \ \ | |||||
| * | | | git-p4: don't use name-rev to get current branchld/p4-current-branch-fix | Luke Diamand | 2017-04-16 | 1 | -1/+1 |
| * | | | git-p4: add failing test for name-rev rather than symbolic-ref | Luke Diamand | 2017-04-16 | 1 | -0/+16 |
* | | | | Merge branch 'dt/gc-ignore-old-gc-logs' | Junio C Hamano | 2017-04-19 | 1 | -1/+17 |
|\ \ \ \ | |||||
| * | | | | t6500: wait for detached auto gc at the end of the test script | SZEDER Gábor | 2017-04-16 | 1 | -1/+17 |
* | | | | | Merge branch 'jk/no-looking-at-dotgit-outside-repo' | Junio C Hamano | 2017-04-19 | 1 | -0/+1 |
|\ \ \ \ \ | |||||
| * | | | | | test-read-cache: setup git dir | René Scharfe | 2017-04-16 | 1 | -0/+1 |
* | | | | | | Merge branch 'nd/files-backend-git-dir' | Junio C Hamano | 2017-04-19 | 4 | -0/+508 |
|\ \ \ \ \ \ | |||||
| * | | | | | | refs.h: add a note about sorting order of for_each_ref_*nd/files-backend-git-dir | Nguyễn Thái Ngọc Duy | 2017-04-14 | 2 | -0/+12 |
| * | | | | | | t1406: new tests for submodule ref store | Nguyễn Thái Ngọc Duy | 2017-04-14 | 1 | -0/+95 |
| * | | | | | | t1405: some basic tests on main ref store | Nguyễn Thái Ngọc Duy | 2017-04-14 | 1 | -0/+123 |
| * | | | | | | t/helper: add test-ref-store to test ref-store functions | Nguyễn Thái Ngọc Duy | 2017-04-14 | 2 | -0/+278 |
* | | | | | | | Merge branch 'lt/mailinfo-in-body-header-continuation' | Junio C Hamano | 2017-04-19 | 1 | -2/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | mailinfo: fix in-body header continuationslt/mailinfo-in-body-header-continuation | Linus Torvalds | 2017-04-11 | 1 | -2/+4 |
* | | | | | | | | Merge branch 'bw/push-options-recursively-to-submodules' | Junio C Hamano | 2017-04-19 | 2 | -0/+92 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | push: propagate remote and refspec with --recurse-submodules | Brandon Williams | 2017-04-11 | 1 | -0/+52 |
| * | | | | | | | | push: propagate push-options with --recurse-submodules | Brandon Williams | 2017-04-11 | 1 | -0/+40 |
* | | | | | | | | | Merge branch 'bc/object-id' | Junio C Hamano | 2017-04-19 | 1 | -10/+10 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Rename sha1_array to oid_array | brian m. carlson | 2017-03-31 | 1 | -5/+5 |
| * | | | | | | | | | Convert sha1_array_for_each_unique and for_each_abbrev to object_id | brian m. carlson | 2017-03-31 | 1 | -3/+3 |
| * | | | | | | | | | Convert sha1_array_lookup to take struct object_id | brian m. carlson | 2017-03-31 | 1 | -1/+1 |
| * | | | | | | | | | Make sha1_array_append take a struct object_id * | brian m. carlson | 2017-03-31 | 1 | -1/+1 |
| * | | | | | | | | | test-sha1-array: convert most code to struct object_id | brian m. carlson | 2017-03-28 | 1 | -5/+5 |
* | | | | | | | | | | Merge branch 'sb/submodule-short-status' | Junio C Hamano | 2017-04-19 | 2 | -6/+147 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | submodule.c: correctly handle nested submodules in is_submodule_modifiedsb/submodule-short-status | Stefan Beller | 2017-03-29 | 2 | -3/+3 |
| * | | | | | | | | | | short status: improve reporting for submodule changes | Stefan Beller | 2017-03-29 | 2 | -5/+130 |
| * | | | | | | | | | | submodule.c: convert is_submodule_modified to use strbuf_getwholeline | Stefan Beller | 2017-03-27 | 1 | -1/+17 |
* | | | | | | | | | | | Merge branch 'js/difftool-builtin' | Junio C Hamano | 2017-04-16 | 1 | -0/+19 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | difftool: fix use-after-freejs/difftool-builtin | Johannes Schindelin | 2017-04-13 | 1 | -0/+19 |
* | | | | | | | | | | | | Merge branch 'sb/show-diff-for-submodule-in-diff-fix' | Junio C Hamano | 2017-04-16 | 1 | -0/+29 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | diff: submodule inline diff to initialize env array.sb/show-diff-for-submodule-in-diff-fix | Stefan Beller | 2017-04-02 | 1 | -0/+29 |
* | | | | | | | | | | | | | Merge branch 'jk/loose-object-info-report-error' | Junio C Hamano | 2017-04-16 | 1 | -0/+24 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | index-pack: detect local corruption in collision checkjk/loose-object-info-report-error | Jeff King | 2017-04-01 | 1 | -0/+17 |
| * | | | | | | | | | | | | | sha1_loose_object_info: return error for corrupted objects | Jeff King | 2017-04-01 | 1 | -0/+7 |
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge branch 'sb/t3600-rephrase' into maint | Junio C Hamano | 2017-03-28 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sb/submodule-update-initial-runs-custom-script' into maint | Junio C Hamano | 2017-03-28 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/quote-env-path-list-component' into maint | Junio C Hamano | 2017-03-28 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'st/verify-tag' into maint | Junio C Hamano | 2017-03-28 | 2 | -14/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/regexec-buf' into maint | Junio C Hamano | 2017-03-28 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dp/filter-branch-prune-empty' into maint | Junio C Hamano | 2017-03-28 | 2 | -0/+42 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mm/fetch-show-error-message-on-unadvertised-object' into maint | Junio C Hamano | 2017-03-28 | 2 | -4/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/interpret-branch-name' into maint | Junio C Hamano | 2017-03-28 | 2 | -0/+141 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ab/cond-skip-tests' into maint | Junio C Hamano | 2017-03-28 | 3 | -1/+16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |